1.1 --- a/Makefile.in	Thu Dec 20 09:56:07 2007 +0000
     1.2 +++ b/Makefile.in	Tue Jan 15 20:50:23 2008 +0000
     1.3 @@ -55,9 +55,13 @@
     1.4  BUILD_SH4X86_TRUE = @BUILD_SH4X86_TRUE@
     1.5  BUILD_SYSTEST_FALSE = @BUILD_SYSTEST_FALSE@
     1.6  BUILD_SYSTEST_TRUE = @BUILD_SYSTEST_TRUE@
     1.7 +BUILD_X86_64_FALSE = @BUILD_X86_64_FALSE@
     1.8 +BUILD_X86_64_TRUE = @BUILD_X86_64_TRUE@
     1.9  CATALOGS = @CATALOGS@
    1.10  CATOBJEXT = @CATOBJEXT@
    1.11  CC = @CC@
    1.12 +CCAS = @CCAS@
    1.13 +CCASFLAGS = @CCASFLAGS@
    1.14  CCDEPMODE = @CCDEPMODE@
    1.15  CDROM_LINUX_FALSE = @CDROM_LINUX_FALSE@
    1.16  CDROM_LINUX_TRUE = @CDROM_LINUX_TRUE@
    1.17 @@ -81,6 +85,8 @@
    1.18  GREP = @GREP@
    1.19  GTK_CFLAGS = @GTK_CFLAGS@
    1.20  GTK_LIBS = @GTK_LIBS@
    1.21 +GUI_CARBON_FALSE = @GUI_CARBON_FALSE@
    1.22 +GUI_CARBON_TRUE = @GUI_CARBON_TRUE@
    1.23  GUI_GTK_FALSE = @GUI_GTK_FALSE@
    1.24  GUI_GTK_TRUE = @GUI_GTK_TRUE@
    1.25  INSTALL_DATA = @INSTALL_DATA@
    1.26 @@ -101,6 +107,7 @@
    1.27  MAKEINFO = @MAKEINFO@
    1.28  MKINSTALLDIRS = @MKINSTALLDIRS@
    1.29  MSGFMT = @MSGFMT@
    1.30 +MSGFMT_OPTS = @MSGFMT_OPTS@
    1.31  OBJEXT = @OBJEXT@
    1.32  PACKAGE = @PACKAGE@
    1.33  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

     2.1 --- a/aclocal.m4	Thu Dec 20 09:56:07 2007 +0000
     2.2 +++ b/aclocal.m4	Tue Jan 15 20:50:23 2008 +0000
     2.3 @@ -1006,6 +1006,38 @@
     2.4  
     2.5  AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
     2.6  
     2.7 +# Figure out how to run the assembler.             -*- Autoconf -*-
     2.8 +
     2.9 +# serial 2
    2.10 +
    2.11 +# Copyright 2001 Free Software Foundation, Inc.
    2.12 +
    2.13 +# This program is free software; you can redistribute it and/or modify
    2.14 +# it under the terms of the GNU General Public License as published by
    2.15 +# the Free Software Foundation; either version 2, or (at your option)
    2.16 +# any later version.
    2.17 +
    2.18 +# This program is distributed in the hope that it will be useful,
    2.19 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    2.20 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    2.21 +# GNU General Public License for more details.
    2.22 +
    2.23 +# You should have received a copy of the GNU General Public License
    2.24 +# along with this program; if not, write to the Free Software
    2.25 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    2.26 +# 02111-1307, USA.
    2.27 +
    2.28 +# AM_PROG_AS
    2.29 +# ----------
    2.30 +AC_DEFUN([AM_PROG_AS],
    2.31 +[# By default we simply use the C compiler to build assembly code.
    2.32 +AC_REQUIRE([AC_PROG_CC])
    2.33 +: ${CCAS='$(CC)'}
    2.34 +# Set ASFLAGS if not already set.
    2.35 +: ${CCASFLAGS='$(CFLAGS)'}
    2.36 +AC_SUBST(CCAS)
    2.37 +AC_SUBST(CCASFLAGS)])
    2.38 +
    2.39  # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
    2.40  # 
    2.41  # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
    2.42 @@ -1144,7 +1176,8 @@
    2.43  
    2.44  _PKG_TEXT
    2.45  ])],
    2.46 -		[$4])
    2.47 +		[AC_MSG_RESULT([no])
    2.48 +                $4])
    2.49  elif test $pkg_failed = untried; then
    2.50  	ifelse([$4], , [AC_MSG_FAILURE(dnl
    2.51  [The pkg-config script could not be found or is too old.  Make sure it
    2.52 @@ -1266,7 +1299,8 @@
    2.53  #-----------------
    2.54  glib_DEFUN([GLIB_WITH_NLS],
    2.55    dnl NLS is obligatory
    2.56 -  [USE_NLS=yes
    2.57 +  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
    2.58 +    USE_NLS=yes
    2.59      AC_SUBST(USE_NLS)
    2.60  
    2.61      gt_cv_have_gettext=no
    2.62 @@ -1370,6 +1404,20 @@
    2.63            glib_save_LIBS="$LIBS"
    2.64            LIBS="$LIBS $INTLLIBS"
    2.65  	  AC_CHECK_FUNCS(dcgettext)
    2.66 +	  MSGFMT_OPTS=
    2.67 +	  AC_MSG_CHECKING([if msgfmt accepts -c])
    2.68 +	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
    2.69 +msgid ""
    2.70 +msgstr ""
    2.71 +"Content-Type: text/plain; charset=UTF-8\n"
    2.72 +"Project-Id-Version: test 1.0\n"
    2.73 +"PO-Revision-Date: 2007-02-15 12:01+0100\n"
    2.74 +"Last-Translator: test <foo@bar.xx>\n"
    2.75 +"Language-Team: C <LL@li.org>\n"
    2.76 +"MIME-Version: 1.0\n"
    2.77 +"Content-Transfer-Encoding: 8bit\n"
    2.78 +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
    2.79 +	  AC_SUBST(MSGFMT_OPTS)
    2.80  	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
    2.81  	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
    2.82  	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
    2.83 @@ -1541,8 +1589,10 @@
    2.84  [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
    2.85  glib_save_prefix="$prefix"
    2.86  glib_save_exec_prefix="$exec_prefix"
    2.87 +glib_save_datarootdir="$datarootdir"
    2.88  test "x$prefix" = xNONE && prefix=$ac_default_prefix
    2.89  test "x$exec_prefix" = xNONE && exec_prefix=$prefix
    2.90 +datarootdir=`eval echo "${datarootdir}"`
    2.91  if test "x$CATOBJEXT" = "x.mo" ; then
    2.92    localedir=`eval echo "${libdir}/locale"`
    2.93  else
    2.94 @@ -1550,6 +1600,7 @@
    2.95  fi
    2.96  prefix="$glib_save_prefix"
    2.97  exec_prefix="$glib_save_exec_prefix"
    2.98 +datarootdir="$glib_save_datarootdir"
    2.99  AC_DEFINE_UNQUOTED($1, "$localedir",
   2.100    [Define the location where the catalogs will be installed])
   2.101  ])
   2.102 @@ -1562,3 +1613,20 @@
   2.103  AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
   2.104  ])dnl
   2.105  
   2.106 +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
   2.107 +# 
   2.108 +# Create a temporary file with TEST-FILE as its contents and pass the
   2.109 +# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
   2.110 +# 0 and perform ACTION-IF-FAIL for any other exit status.
   2.111 +AC_DEFUN([GLIB_RUN_PROG],
   2.112 +[cat >conftest.foo <<_ACEOF
   2.113 +$2
   2.114 +_ACEOF
   2.115 +if AC_RUN_LOG([$1 conftest.foo]); then
   2.116 +  m4_ifval([$3], [$3], [:])
   2.117 +m4_ifvaln([$4], [else $4])dnl
   2.118 +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
   2.119 +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
   2.120 +fi])
   2.121 +
   2.122 +

     3.1 --- a/config.h.in	Thu Dec 20 09:56:07 2007 +0000
     3.2 +++ b/config.h.in	Tue Jan 15 20:50:23 2008 +0000
     3.3 @@ -13,6 +13,12 @@
     3.4  /* always defined to indicate that i18n is enabled */
     3.5  #undef ENABLE_NLS
     3.6  
     3.7 +/* Enable IO tracing */
     3.8 +#undef ENABLE_TRACE_IO
     3.9 +
    3.10 +/* Enable watchpoints */
    3.11 +#undef ENABLE_WATCH
    3.12 +
    3.13  /* translation domain */
    3.14  #undef GETTEXT_PACKAGE
    3.15  

     4.1 --- a/configure	Thu Dec 20 09:56:07 2007 +0000
     4.2 +++ b/configure	Tue Jan 15 20:50:23 2008 +0000
     4.3 @@ -687,6 +687,8 @@
     4.4  CCDEPMODE
     4.5  am__fastdepCC_TRUE
     4.6  am__fastdepCC_FALSE
     4.7 +CCAS
     4.8 +CCASFLAGS
     4.9  CPP
    4.10  GREP
    4.11  EGREP
    4.12 @@ -709,6 +711,8 @@
    4.13  GUI_GTK_FALSE
    4.14  BUILD_SH4X86_TRUE
    4.15  BUILD_SH4X86_FALSE
    4.16 +BUILD_X86_64_TRUE
    4.17 +BUILD_X86_64_FALSE
    4.18  ESOUND_CFLAGS
    4.19  ESOUND_LIBS
    4.20  AUDIO_ESOUND_TRUE
    4.21 @@ -728,6 +732,7 @@
    4.22  GETTEXT_PACKAGE
    4.23  USE_NLS
    4.24  MSGFMT
    4.25 +MSGFMT_OPTS
    4.26  GMSGFMT
    4.27  XGETTEXT
    4.28  CATALOGS
    4.29 @@ -1341,6 +1346,10 @@
    4.30                            (and sometimes confusing) to the casual installer
    4.31    --disable-dependency-tracking Speeds up one-time builds
    4.32    --enable-dependency-tracking  Do not reject slow dependency extractors
    4.33 +  --enable-trace          Enable generation of IO traces (warning: hurts
    4.34 +                          performance)
    4.35 +  --enable-watch          Enable watchpoints in the debugger (warning: hurts
    4.36 +                          performance)
    4.37  
    4.38  Some influential environment variables:
    4.39    CC          C compiler command
    4.40 @@ -4293,6 +4302,13 @@
    4.41    *) CC="$CC $am_cv_prog_cc_stdc" ;;
    4.42  esac
    4.43  
    4.44 +# By default we simply use the C compiler to build assembly code.
    4.45 +
    4.46 +: ${CCAS='$(CC)'}
    4.47 +# Set ASFLAGS if not already set.
    4.48 +: ${CCASFLAGS='$(CFLAGS)'}
    4.49 +
    4.50 +
    4.51  ac_ext=c
    4.52  ac_cpp='$CPP $CPPFLAGS'
    4.53  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    4.54 @@ -4943,6 +4959,27 @@
    4.55  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
    4.56  
    4.57  
    4.58 +# Check whether --enable-trace was given.
    4.59 +if test "${enable_trace+set}" = set; then
    4.60 +  enableval=$enable_trace; if test "$enableval" == "yes"; then
    4.61 +
    4.62 +cat >>confdefs.h <<\_ACEOF
    4.63 +#define ENABLE_TRACE_IO 1
    4.64 +_ACEOF
    4.65 +
    4.66 +    fi
    4.67 +fi
    4.68 +
    4.69 +# Check whether --enable-watch was given.
    4.70 +if test "${enable_watch+set}" = set; then
    4.71 +  enableval=$enable_watch; if test "$enableval" == "yes"; then
    4.72 +
    4.73 +cat >>confdefs.h <<\_ACEOF
    4.74 +#define ENABLE_WATCH 1
    4.75 +_ACEOF
    4.76 +
    4.77 +   fi
    4.78 +fi
    4.79  
    4.80  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
    4.81  
    4.82 @@ -5848,6 +5885,16 @@
    4.83  
    4.84  
    4.85  
    4.86 +if test "$SH4_TRANSLATOR" = "x86_64"; then
    4.87 +  BUILD_X86_64_TRUE=
    4.88 +  BUILD_X86_64_FALSE='#'
    4.89 +else
    4.90 +  BUILD_X86_64_TRUE='#'
    4.91 +  BUILD_X86_64_FALSE=
    4.92 +fi
    4.93 +
    4.94 +
    4.95 +
    4.96  pkg_failed=no
    4.97  { echo "$as_me:$LINENO: checking for ESOUND" >&5
    4.98  echo $ECHO_N "checking for ESOUND... $ECHO_C" >&6; }
    4.99 @@ -5906,7 +5953,9 @@
   4.100  	# Put the nasty error message in config.log where it belongs
   4.101  	echo "$ESOUND_PKG_ERRORS" >&5
   4.102  
   4.103 -	 echo "Warning: esound not found - building without audio support"
   4.104 +	{ echo "$as_me:$LINENO: result: no" >&5
   4.105 +echo "${ECHO_T}no" >&6; }
   4.106 +                 echo "Warning: esound not found - building without audio support"
   4.107  elif test $pkg_failed = untried; then
   4.108  	 echo "Warning: esound not found - building without audio support"
   4.109  else
   4.110 @@ -6562,7 +6611,7 @@
   4.111  
   4.112      fi
   4.113    fi
   4.114 -     USE_NLS=yes
   4.115 +         USE_NLS=yes
   4.116  
   4.117  
   4.118      gt_cv_have_gettext=no
   4.119 @@ -7517,6 +7566,35 @@
   4.120  fi
   4.121  done
   4.122  
   4.123 +	  MSGFMT_OPTS=
   4.124 +	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
   4.125 +echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
   4.126 +	  cat >conftest.foo <<_ACEOF
   4.127 +
   4.128 +msgid ""
   4.129 +msgstr ""
   4.130 +"Content-Type: text/plain; charset=UTF-8\n"
   4.131 +"Project-Id-Version: test 1.0\n"
   4.132 +"PO-Revision-Date: 2007-02-15 12:01+0100\n"
   4.133 +"Last-Translator: test <foo@bar.xx>\n"
   4.134 +"Language-Team: C <LL@li.org>\n"
   4.135 +"MIME-Version: 1.0\n"
   4.136 +"Content-Transfer-Encoding: 8bit\n"
   4.137 +
   4.138 +_ACEOF
   4.139 +if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
   4.140 +  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
   4.141 +  ac_status=$?
   4.142 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   4.143 +  (exit $ac_status); }; then
   4.144 +  MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
   4.145 +echo "${ECHO_T}yes" >&6; }
   4.146 +else { echo "$as_me:$LINENO: result: no" >&5
   4.147 +echo "${ECHO_T}no" >&6; }
   4.148 +echo "$as_me: failed input was:" >&5
   4.149 +sed 's/^/| /' conftest.foo >&5
   4.150 +fi
   4.151 +
   4.152  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
   4.153  set dummy gmsgfmt; ac_word=$2
   4.154  { echo "$as_me:$LINENO: checking for $ac_word" >&5
   4.155 @@ -7996,6 +8074,13 @@
   4.156  Usually this means the macro was only invoked conditionally." >&2;}
   4.157     { (exit 1); exit 1; }; }
   4.158  fi
   4.159 +if test -z "${BUILD_X86_64_TRUE}" && test -z "${BUILD_X86_64_FALSE}"; then
   4.160 +  { { echo "$as_me:$LINENO: error: conditional \"BUILD_X86_64\" was never defined.
   4.161 +Usually this means the macro was only invoked conditionally." >&5
   4.162 +echo "$as_me: error: conditional \"BUILD_X86_64\" was never defined.
   4.163 +Usually this means the macro was only invoked conditionally." >&2;}
   4.164 +   { (exit 1); exit 1; }; }
   4.165 +fi
   4.166  if test -z "${AUDIO_ESOUND_TRUE}" && test -z "${AUDIO_ESOUND_FALSE}"; then
   4.167    { { echo "$as_me:$LINENO: error: conditional \"AUDIO_ESOUND\" was never defined.
   4.168  Usually this means the macro was only invoked conditionally." >&5
   4.169 @@ -8634,6 +8719,8 @@
   4.170  CCDEPMODE!$CCDEPMODE$ac_delim
   4.171  am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
   4.172  am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
   4.173 +CCAS!$CCAS$ac_delim
   4.174 +CCASFLAGS!$CCASFLAGS$ac_delim
   4.175  CPP!$CPP$ac_delim
   4.176  GREP!$GREP$ac_delim
   4.177  EGREP!$EGREP$ac_delim
   4.178 @@ -8655,8 +8742,6 @@
   4.179  GUI_GTK_TRUE!$GUI_GTK_TRUE$ac_delim
   4.180  GUI_GTK_FALSE!$GUI_GTK_FALSE$ac_delim
   4.181  BUILD_SH4X86_TRUE!$BUILD_SH4X86_TRUE$ac_delim
   4.182 -BUILD_SH4X86_FALSE!$BUILD_SH4X86_FALSE$ac_delim
   4.183 -ESOUND_CFLAGS!$ESOUND_CFLAGS$ac_delim
   4.184  _ACEOF
   4.185  
   4.186    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
   4.187 @@ -8698,6 +8783,10 @@
   4.188  ac_delim='%!_!# '
   4.189  for ac_last_try in false false false false false :; do
   4.190    cat >conf$$subs.sed <<_ACEOF
   4.191 +BUILD_SH4X86_FALSE!$BUILD_SH4X86_FALSE$ac_delim
   4.192 +BUILD_X86_64_TRUE!$BUILD_X86_64_TRUE$ac_delim
   4.193 +BUILD_X86_64_FALSE!$BUILD_X86_64_FALSE$ac_delim
   4.194 +ESOUND_CFLAGS!$ESOUND_CFLAGS$ac_delim
   4.195  ESOUND_LIBS!$ESOUND_LIBS$ac_delim
   4.196  AUDIO_ESOUND_TRUE!$AUDIO_ESOUND_TRUE$ac_delim
   4.197  AUDIO_ESOUND_FALSE!$AUDIO_ESOUND_FALSE$ac_delim
   4.198 @@ -8716,6 +8805,7 @@
   4.199  GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
   4.200  USE_NLS!$USE_NLS$ac_delim
   4.201  MSGFMT!$MSGFMT$ac_delim
   4.202 +MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
   4.203  GMSGFMT!$GMSGFMT$ac_delim
   4.204  XGETTEXT!$XGETTEXT$ac_delim
   4.205  CATALOGS!$CATALOGS$ac_delim
   4.206 @@ -8733,7 +8823,7 @@
   4.207  LTLIBOBJS!$LTLIBOBJS$ac_delim
   4.208  _ACEOF
   4.209  
   4.210 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
   4.211 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then
   4.212      break
   4.213    elif $ac_last_try; then
   4.214      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

     5.1 --- a/configure.in	Thu Dec 20 09:56:07 2007 +0000
     5.2 +++ b/configure.in	Tue Jan 15 20:50:23 2008 +0000
     5.3 @@ -8,10 +8,20 @@
     5.4  AC_ISC_POSIX
     5.5  AC_PROG_CC
     5.6  AM_PROG_CC_STDC
     5.7 +AM_PROG_AS
     5.8  AC_HEADER_STDC
     5.9  AC_CANONICAL_BUILD
    5.10  AC_CANONICAL_HOST
    5.11 -
    5.12 +AC_ARG_ENABLE( trace, 
    5.13 +   AS_HELP_STRING( [--enable-trace], [Enable generation of IO traces (warning: hurts performance)]),
    5.14 +   [if test "$enableval" == "yes"; then
    5.15 +     AC_DEFINE(ENABLE_TRACE_IO, 1, [Enable IO tracing])
    5.16 +    fi] )
    5.17 +AC_ARG_ENABLE( watch,
    5.18 +   AS_HELP_STRING( [--enable-watch], [Enable watchpoints in the debugger (warning: hurts performance)]),
    5.19 +   [if test "$enableval" == "yes"; then
    5.20 +     AC_DEFINE(ENABLE_WATCH, 1, [Enable watchpoints])
    5.21 +   fi] )
    5.22  dnl ----------- Check for mandatory dependencies --------------
    5.23  dnl Building on MAC?
    5.24  AC_CHECK_HEADER([Carbon/Carbon.h], [
    5.25 @@ -60,6 +70,7 @@
    5.26  	echo "Warning: No translator available for $host. Building emulation core only";;
    5.27  esac
    5.28  AM_CONDITIONAL(BUILD_SH4X86, [test "$SH4_TRANSLATOR" = "x86" -o "$SH4_TRANSLATOR" = "x86_64"])
    5.29 +AM_CONDITIONAL(BUILD_X86_64, [test "$SH4_TRANSLATOR" = "x86_64"])
    5.30  
    5.31  dnl ------------------ Optional driver support -------------------
    5.32  dnl Check for esound

     6.1 --- a/src/Makefile.am	Thu Dec 20 09:56:07 2007 +0000
     6.2 +++ b/src/Makefile.am	Tue Jan 15 20:50:23 2008 +0000
     6.3 @@ -29,7 +29,7 @@
     6.4          sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c sh4/dmac.c \
     6.5          sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h \
     6.6          sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h \
     6.7 -	sh4/xltcache.c sh4/xltcache.h \
     6.8 +	sh4/xltcache.c sh4/xltcache.h sh4/sh4.h \
     6.9          aica/armcore.c aica/armcore.h aica/armdasm.c aica/armmem.c \
    6.10          aica/aica.c aica/aica.h aica/audio.c aica/audio.h \
    6.11  	pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \
    6.12 @@ -48,17 +48,16 @@
    6.13          sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \
    6.14          sh4/sh4trans.c sh4/sh4trans.h \
    6.15          x86dasm/x86dasm.c x86dasm/x86dasm.h \
    6.16 -        x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c
    6.17 +        x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c 
    6.18  
    6.19 +test_testsh4x86_LDADD = @GTK_LIBS@
    6.20  test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
    6.21  	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
    6.22  	x86dasm/dis-buf.c \
    6.23  	sh4/sh4dasm.c sh4/sh4trans.c sh4/sh4x86.c sh4/xltcache.c \
    6.24 -	sh4/xltcache.h mem.c util.c
    6.25 -test_testsh4x86_LDADD = @GTK_LIBS@
    6.26 +	sh4/xltcache.h mem.c util.c sh4/mmu.c
    6.27  
    6.28  check_PROGRAMS += test/testsh4x86
    6.29 -
    6.30  endif
    6.31  
    6.32  if GUI_GTK

     7.1 --- a/src/Makefile.in	Thu Dec 20 09:56:07 2007 +0000
     7.2 +++ b/src/Makefile.in	Tue Jan 15 20:50:23 2008 +0000
     7.3 @@ -40,7 +40,7 @@
     7.4  @BUILD_SH4X86_TRUE@        sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \
     7.5  @BUILD_SH4X86_TRUE@        sh4/sh4trans.c sh4/sh4trans.h \
     7.6  @BUILD_SH4X86_TRUE@        x86dasm/x86dasm.c x86dasm/x86dasm.h \
     7.7 -@BUILD_SH4X86_TRUE@        x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c
     7.8 +@BUILD_SH4X86_TRUE@        x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c 
     7.9  
    7.10  @BUILD_SH4X86_TRUE@am__append_2 = test/testsh4x86
    7.11  @GUI_GTK_TRUE@am__append_3 = gtkui/gtkui.c gtkui/gtkui.h \
    7.12 @@ -72,9 +72,13 @@
    7.13  BUILD_SH4X86_TRUE = @BUILD_SH4X86_TRUE@
    7.14  BUILD_SYSTEST_FALSE = @BUILD_SYSTEST_FALSE@
    7.15  BUILD_SYSTEST_TRUE = @BUILD_SYSTEST_TRUE@
    7.16 +BUILD_X86_64_FALSE = @BUILD_X86_64_FALSE@
    7.17 +BUILD_X86_64_TRUE = @BUILD_X86_64_TRUE@
    7.18  CATALOGS = @CATALOGS@
    7.19  CATOBJEXT = @CATOBJEXT@
    7.20  CC = @CC@
    7.21 +CCAS = @CCAS@
    7.22 +CCASFLAGS = @CCASFLAGS@
    7.23  CCDEPMODE = @CCDEPMODE@
    7.24  CDROM_LINUX_FALSE = @CDROM_LINUX_FALSE@
    7.25  CDROM_LINUX_TRUE = @CDROM_LINUX_TRUE@
    7.26 @@ -120,6 +124,7 @@
    7.27  MAKEINFO = @MAKEINFO@
    7.28  MKINSTALLDIRS = @MKINSTALLDIRS@
    7.29  MSGFMT = @MSGFMT@
    7.30 +MSGFMT_OPTS = @MSGFMT_OPTS@
    7.31  OBJEXT = @OBJEXT@
    7.32  PACKAGE = @PACKAGE@
    7.33  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    7.34 @@ -213,7 +218,7 @@
    7.35          sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c sh4/dmac.c \
    7.36          sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h \
    7.37          sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h \
    7.38 -	sh4/xltcache.c sh4/xltcache.h \
    7.39 +	sh4/xltcache.c sh4/xltcache.h sh4/sh4.h \
    7.40          aica/armcore.c aica/armcore.h aica/armdasm.c aica/armmem.c \
    7.41          aica/aica.c aica/aica.h aica/audio.c aica/audio.h \
    7.42  	pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \
    7.43 @@ -228,13 +233,13 @@
    7.44  	drivers/gl_sl.c drivers/gl_slsrc.c\
    7.45  $(am__append_1) $(am__append_3) $(am__append_4) $(am__append_5) $(am__append_6)
    7.46  
    7.47 +@BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GTK_LIBS@
    7.48  @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
    7.49  @BUILD_SH4X86_TRUE@	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
    7.50  @BUILD_SH4X86_TRUE@	x86dasm/dis-buf.c \
    7.51  @BUILD_SH4X86_TRUE@	sh4/sh4dasm.c sh4/sh4trans.c sh4/sh4x86.c sh4/xltcache.c \
    7.52 -@BUILD_SH4X86_TRUE@	sh4/xltcache.h mem.c util.c
    7.53 +@BUILD_SH4X86_TRUE@	sh4/xltcache.h mem.c util.c sh4/mmu.c
    7.54  
    7.55 -@BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GTK_LIBS@
    7.56  
    7.57  lxdream_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @ESOUND_LIBS@ $(INTLLIBS)
    7.58  
    7.59 @@ -271,25 +276,25 @@
    7.60  	sh4/intc.h sh4/sh4mem.c sh4/timer.c sh4/dmac.c sh4/mmu.c \
    7.61  	sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h \
    7.62  	sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c \
    7.63 -	sh4/sh4stat.h sh4/xltcache.c sh4/xltcache.h aica/armcore.c \
    7.64 -	aica/armcore.h aica/armdasm.c aica/armmem.c aica/aica.c \
    7.65 -	aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c pvr2/pvr2.h \
    7.66 -	pvr2/pvr2mem.c pvr2/tacore.c pvr2/render.c pvr2/rendcore.c \
    7.67 -	pvr2/rendbkg.c pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c \
    7.68 -	pvr2/rendsave.c maple/maple.c maple/maple.h maple/controller.c \
    7.69 -	maple/controller.h loader.c bootstrap.c util.c display.c \
    7.70 -	display.h drivers/audio_null.c drivers/video_null.c \
    7.71 -	drivers/gl_common.c drivers/gl_common.h drivers/gl_fbo.c \
    7.72 -	drivers/gl_sl.c drivers/gl_slsrc.c sh4/sh4x86.c sh4/x86op.h \
    7.73 -	sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h sh4/sh4trans.c \
    7.74 -	sh4/sh4trans.h x86dasm/x86dasm.c x86dasm/x86dasm.h \
    7.75 -	x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \
    7.76 -	gtkui/gtkui.c gtkui/gtkui.h gtkui/main_win.c gtkui/gtkcb.c \
    7.77 -	gtkui/mmio_win.c gtkui/debug_win.c gtkui/dump_win.c \
    7.78 -	gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \
    7.79 -	drivers/video_gtk.c drivers/video_gtk.h drivers/video_glx.c \
    7.80 -	drivers/video_glx.h drivers/cd_linux.c drivers/cd_none.c \
    7.81 -	drivers/audio_esd.c
    7.82 +	sh4/sh4stat.h sh4/xltcache.c sh4/xltcache.h sh4/sh4.h \
    7.83 +	aica/armcore.c aica/armcore.h aica/armdasm.c aica/armmem.c \
    7.84 +	aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \
    7.85 +	pvr2/pvr2.h pvr2/pvr2mem.c pvr2/tacore.c pvr2/render.c \
    7.86 +	pvr2/rendcore.c pvr2/rendbkg.c pvr2/rendsort.c pvr2/texcache.c \
    7.87 +	pvr2/yuv.c pvr2/rendsave.c maple/maple.c maple/maple.h \
    7.88 +	maple/controller.c maple/controller.h loader.c bootstrap.c \
    7.89 +	util.c display.c display.h drivers/audio_null.c \
    7.90 +	drivers/video_null.c drivers/gl_common.c drivers/gl_common.h \
    7.91 +	drivers/gl_fbo.c drivers/gl_sl.c drivers/gl_slsrc.c \
    7.92 +	sh4/sh4x86.c sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h \
    7.93 +	sh4/ia64abi.h sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \
    7.94 +	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
    7.95 +	x86dasm/dis-buf.c gtkui/gtkui.c gtkui/gtkui.h gtkui/main_win.c \
    7.96 +	gtkui/gtkcb.c gtkui/mmio_win.c gtkui/debug_win.c \
    7.97 +	gtkui/dump_win.c gtkui/ctrl_dlg.c gtkui/path_dlg.c \
    7.98 +	gtkui/gdrom_menu.c drivers/video_gtk.c drivers/video_gtk.h \
    7.99 +	drivers/video_glx.c drivers/video_glx.h drivers/cd_linux.c \
   7.100 +	drivers/cd_none.c drivers/audio_esd.c
   7.101  @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
   7.102  @BUILD_SH4X86_TRUE@	x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
   7.103  @BUILD_SH4X86_TRUE@	dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
   7.104 @@ -327,13 +332,13 @@
   7.105  am__test_testsh4x86_SOURCES_DIST = test/testsh4x86.c x86dasm/x86dasm.c \
   7.106  	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
   7.107  	x86dasm/dis-buf.c sh4/sh4dasm.c sh4/sh4trans.c sh4/sh4x86.c \
   7.108 -	sh4/xltcache.c sh4/xltcache.h mem.c util.c
   7.109 +	sh4/xltcache.c sh4/xltcache.h mem.c util.c sh4/mmu.c
   7.110  @BUILD_SH4X86_TRUE@am_test_testsh4x86_OBJECTS = testsh4x86.$(OBJEXT) \
   7.111  @BUILD_SH4X86_TRUE@	x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
   7.112  @BUILD_SH4X86_TRUE@	dis-init.$(OBJEXT) dis-buf.$(OBJEXT) \
   7.113  @BUILD_SH4X86_TRUE@	sh4dasm.$(OBJEXT) sh4trans.$(OBJEXT) \
   7.114  @BUILD_SH4X86_TRUE@	sh4x86.$(OBJEXT) xltcache.$(OBJEXT) \
   7.115 -@BUILD_SH4X86_TRUE@	mem.$(OBJEXT) util.$(OBJEXT)
   7.116 +@BUILD_SH4X86_TRUE@	mem.$(OBJEXT) util.$(OBJEXT) mmu.$(OBJEXT)
   7.117  test_testsh4x86_OBJECTS = $(am_test_testsh4x86_OBJECTS)
   7.118  @BUILD_SH4X86_TRUE@test_testsh4x86_DEPENDENCIES =
   7.119  @BUILD_SH4X86_FALSE@test_testsh4x86_DEPENDENCIES =

     8.1 --- a/src/aica/aica.c	Thu Dec 20 09:56:07 2007 +0000
     8.2 +++ b/src/aica/aica.c	Tue Jan 15 20:50:23 2008 +0000
     8.3 @@ -1,5 +1,5 @@
     8.4  /**
     8.5 - * $Id: aica.c,v 1.26 2007-10-31 09:05:13 nkeynes Exp $
     8.6 + * $Id$
     8.7   * 
     8.8   * This module implements the AICA's IO interfaces, as well
     8.9   * as providing the core AICA module to the system.

     9.1 --- a/src/aica/aica.h	Thu Dec 20 09:56:07 2007 +0000
     9.2 +++ b/src/aica/aica.h	Tue Jan 15 20:50:23 2008 +0000
     9.3 @@ -1,5 +1,5 @@
     9.4  /**
     9.5 - * $Id: aica.h,v 1.12 2007-10-27 05:47:21 nkeynes Exp $
     9.6 + * $Id$
     9.7   * 
     9.8   * MMIO definitions for the AICA sound chip. Note that the regions defined
     9.9   * here are relative to the SH4 memory map (0x00700000 based), rather than

    10.1 --- a/src/aica/armcore.c	Thu Dec 20 09:56:07 2007 +0000
    10.2 +++ b/src/aica/armcore.c	Tue Jan 15 20:50:23 2008 +0000
    10.3 @@ -1,5 +1,5 @@
    10.4  /**
    10.5 - * $Id: armcore.c,v 1.21 2007-10-09 08:11:51 nkeynes Exp $
    10.6 + * $Id$
    10.7   * 
    10.8   * ARM7TDMI CPU emulation core.
    10.9   *
   10.10 @@ -53,14 +53,14 @@
   10.11  static struct breakpoint_struct arm_breakpoints[MAX_BREAKPOINTS];
   10.12  static int arm_breakpoint_count = 0;
   10.13  
   10.14 -void arm_set_breakpoint( uint32_t pc, int type )
   10.15 +void arm_set_breakpoint( uint32_t pc, breakpoint_type_t type )
   10.16  {
   10.17      arm_breakpoints[arm_breakpoint_count].address = pc;
   10.18      arm_breakpoints[arm_breakpoint_count].type = type;
   10.19      arm_breakpoint_count++;
   10.20  }
   10.21  
   10.22 -gboolean arm_clear_breakpoint( uint32_t pc, int type )
   10.23 +gboolean arm_clear_breakpoint( uint32_t pc, breakpoint_type_t type )
   10.24  {
   10.25      int i;
   10.26  

    11.1 --- a/src/aica/armcore.h	Thu Dec 20 09:56:07 2007 +0000
    11.2 +++ b/src/aica/armcore.h	Tue Jan 15 20:50:23 2008 +0000
    11.3 @@ -1,5 +1,5 @@
    11.4  /**
    11.5 - * $Id: armcore.h,v 1.15 2007-10-09 08:11:51 nkeynes Exp $
    11.6 + * $Id$
    11.7   * 
    11.8   * Interface definitions for the ARM CPU emulation core proper.
    11.9   *
   11.10 @@ -19,7 +19,8 @@
   11.11  #ifndef dream_armcore_H
   11.12  #define dream_armcore_H 1
   11.13  
   11.14 -#include "dream.h"
   11.15 +#include "lxdream.h"
   11.16 +#include "mem.h"
   11.17  #include <stdint.h>
   11.18  #include <stdio.h>
   11.19  
   11.20 @@ -88,8 +89,8 @@
   11.21  void arm_save_state( FILE *f );
   11.22  int arm_load_state( FILE *f );
   11.23  gboolean arm_execute_instruction( void );
   11.24 -void arm_set_breakpoint( uint32_t pc, int type );
   11.25 -gboolean arm_clear_breakpoint( uint32_t pc, int type );
   11.26 +void arm_set_breakpoint( uint32_t pc, breakpoint_type_t type );
   11.27 +gboolean arm_clear_breakpoint( uint32_t pc, breakpoint_type_t type );
   11.28  int arm_get_breakpoint( uint32_t pc );
   11.29  
   11.30  /* ARM Memory */

    12.1 --- a/src/aica/armdasm.c	Thu Dec 20 09:56:07 2007 +0000
    12.2 +++ b/src/aica/armdasm.c	Tue Jan 15 20:50:23 2008 +0000
    12.3 @@ -1,5 +1,5 @@
    12.4  /**
    12.5 - * $Id: armdasm.c,v 1.13 2007-10-09 08:11:51 nkeynes Exp $
    12.6 + * $Id$
    12.7   * 
    12.8   * armdasm.c    21 Aug 2004  - ARM7tdmi (ARMv4) disassembler
    12.9   *

    13.1 --- a/src/aica/armdasm.h	Thu Dec 20 09:56:07 2007 +0000
    13.2 +++ b/src/aica/armdasm.h	Tue Jan 15 20:50:23 2008 +0000
    13.3 @@ -1,5 +1,5 @@
    13.4  /**
    13.5 - * $Id: armdasm.h,v 1.2 2005-12-25 05:57:00 nkeynes Exp $
    13.6 + * $Id$
    13.7   * 
    13.8   * ARM CPU definition and disassembly function declarations
    13.9   *

    14.1 --- a/src/aica/armmem.c	Thu Dec 20 09:56:07 2007 +0000
    14.2 +++ b/src/aica/armmem.c	Tue Jan 15 20:50:23 2008 +0000
    14.3 @@ -1,5 +1,5 @@
    14.4  /**
    14.5 - * $Id: armmem.c,v 1.9 2007-11-08 11:54:16 nkeynes Exp $
    14.6 + * $Id$
    14.7   *
    14.8   * Implements the ARM's memory map.
    14.9   *

    15.1 --- a/src/aica/audio.c	Thu Dec 20 09:56:07 2007 +0000
    15.2 +++ b/src/aica/audio.c	Tue Jan 15 20:50:23 2008 +0000
    15.3 @@ -1,5 +1,5 @@
    15.4  /**
    15.5 - * $Id: audio.c,v 1.11 2007-10-27 05:47:21 nkeynes Exp $
    15.6 + * $Id$
    15.7   * 
    15.8   * Audio mixer core. Combines all the active streams into a single sound
    15.9   * buffer for output. 

    16.1 --- a/src/aica/audio.h	Thu Dec 20 09:56:07 2007 +0000
    16.2 +++ b/src/aica/audio.h	Tue Jan 15 20:50:23 2008 +0000
    16.3 @@ -1,5 +1,5 @@
    16.4  /**
    16.5 - * $Id: audio.h,v 1.10 2007-10-27 05:47:21 nkeynes Exp $
    16.6 + * $Id$
    16.7   * 
    16.8   * Audio engine, ie the part that does the actual work.
    16.9   *

    17.1 --- a/src/asic.c	Thu Dec 20 09:56:07 2007 +0000
    17.2 +++ b/src/asic.c	Tue Jan 15 20:50:23 2008 +0000
    17.3 @@ -1,5 +1,5 @@
    17.4  /**
    17.5 - * $Id: asic.c,v 1.30 2007-10-08 12:06:01 nkeynes Exp $
    17.6 + * $Id$
    17.7   *
    17.8   * Support for the miscellaneous ASIC functions (Primarily event multiplexing,
    17.9   * and DMA). 
   17.10 @@ -25,7 +25,7 @@
   17.11  #include "mem.h"
   17.12  #include "sh4/intc.h"
   17.13  #include "sh4/dmac.h"
   17.14 -#include "sh4/sh4core.h"
   17.15 +#include "sh4/sh4.h"
   17.16  #include "dreamcast.h"
   17.17  #include "maple/maple.h"
   17.18  #include "gdrom/ide.h"
   17.19 @@ -348,7 +348,6 @@
   17.20      case SYSRESET:
   17.21  	if( val == 0x7611 ) {
   17.22  	    dreamcast_reset();
   17.23 -	    sh4r.new_pc = sh4r.pc;
   17.24  	} else {
   17.25  	    WARN( "Unknown value %08X written to SYSRESET port", val );
   17.26  	}
   17.27 @@ -387,11 +386,6 @@
   17.28  {
   17.29      int32_t val;
   17.30      switch( reg ) {
   17.31 -        /*
   17.32 -        case 0x89C:
   17.33 -            sh4_stop();
   17.34 -            return 0x000000B;
   17.35 -        */     
   17.36      case PIRQ0:
   17.37      case PIRQ1:
   17.38      case PIRQ2:
   17.39 @@ -531,8 +525,6 @@
   17.40      case PVRDMA2CTL2:
   17.41  	if( val != 0 ) {
   17.42  	    ERROR( "Write to unimplemented DMA control register %08X", reg );
   17.43 -	    //dreamcast_stop();
   17.44 -	    //sh4_stop();
   17.45  	}
   17.46  	break;
   17.47      default:

    18.1 --- a/src/asic.h	Thu Dec 20 09:56:07 2007 +0000
    18.2 +++ b/src/asic.h	Tue Jan 15 20:50:23 2008 +0000
    18.3 @@ -1,5 +1,5 @@
    18.4  /**
    18.5 - * $Id: asic.h,v 1.19 2007-01-25 10:16:32 nkeynes Exp $
    18.6 + * $Id$
    18.7   *
    18.8   * Support for the miscellaneous ASIC functions (Primarily event multiplexing,
    18.9   * and DMA). Includes MMIO definitions for the 5f6000 and 5f7000 regions, 

    19.1 --- a/src/bios.c	Thu Dec 20 09:56:07 2007 +0000
    19.2 +++ b/src/bios.c	Tue Jan 15 20:50:23 2008 +0000
    19.3 @@ -1,5 +1,5 @@
    19.4  /**
    19.5 - * $Id: bios.c,v 1.5 2007-11-08 11:54:16 nkeynes Exp $
    19.6 + * $Id$
    19.7   * 
    19.8   * "Fake" BIOS functions, for operation without the actual BIOS.
    19.9   *
   19.10 @@ -20,7 +20,7 @@
   19.11  #include "mem.h"
   19.12  #include "syscall.h"
   19.13  #include "dreamcast.h"
   19.14 -#include "sh4/sh4core.h"
   19.15 +#include "sh4/sh4.h"
   19.16  
   19.17  #define COMMAND_QUEUE_LENGTH 16
   19.18  

    20.1 --- a/src/bootstrap.c	Thu Dec 20 09:56:07 2007 +0000
    20.2 +++ b/src/bootstrap.c	Tue Jan 15 20:50:23 2008 +0000
    20.3 @@ -1,5 +1,5 @@
    20.4  /**
    20.5 - * $Id: bootstrap.c,v 1.9 2007-11-08 11:54:16 nkeynes Exp $
    20.6 + * $Id$
    20.7   *
    20.8   * CD Bootstrap header parsing. Mostly for informational purposes.
    20.9   *

    21.1 --- a/src/bootstrap.h	Thu Dec 20 09:56:07 2007 +0000
    21.2 +++ b/src/bootstrap.h	Tue Jan 15 20:50:23 2008 +0000
    21.3 @@ -1,5 +1,5 @@
    21.4  /**
    21.5 - * $Id: bootstrap.h,v 1.6 2007-11-08 11:54:16 nkeynes Exp $
    21.6 + * $Id$
    21.7   *
    21.8   * CD Bootstrap header parsing. Mostly for informational purposes.
    21.9   *

    22.1 --- a/src/clock.h	Thu Dec 20 09:56:07 2007 +0000
    22.2 +++ b/src/clock.h	Tue Jan 15 20:50:23 2008 +0000
    22.3 @@ -1,5 +1,5 @@
    22.4  /**
    22.5 - * $Id: clock.h,v 1.5 2007-01-06 04:06:36 nkeynes Exp $
    22.6 + * $Id$
    22.7   * External interface to the dreamcast serial port, implemented by 
    22.8   * sh4/scif.c
    22.9   *

    23.1 --- a/src/config.c	Thu Dec 20 09:56:07 2007 +0000
    23.2 +++ b/src/config.c	Tue Jan 15 20:50:23 2008 +0000
    23.3 @@ -1,5 +1,5 @@
    23.4  /**
    23.5 - * $Id: config.c,v 1.7 2007-10-31 11:53:35 nkeynes Exp $
    23.6 + * $Id$
    23.7   *
    23.8   * User configuration support
    23.9   *

    24.1 --- a/src/config.h	Thu Dec 20 09:56:07 2007 +0000
    24.2 +++ b/src/config.h	Tue Jan 15 20:50:23 2008 +0000
    24.3 @@ -1,5 +1,5 @@
    24.4  /**
    24.5 - * $Id: config.h,v 1.5 2007-10-28 08:29:29 nkeynes Exp $
    24.6 + * $Id$
    24.7   *
    24.8   * User configuration support
    24.9   *

    25.1 --- a/src/cpu.h	Thu Dec 20 09:56:07 2007 +0000
    25.2 +++ b/src/cpu.h	Tue Jan 15 20:50:23 2008 +0000
    25.3 @@ -1,5 +1,5 @@
    25.4  /**
    25.5 - * $Id: cpu.h,v 1.9 2007-10-08 11:50:15 nkeynes Exp $
    25.6 + * $Id$
    25.7   * 
    25.8   * Generic CPU definitions, primarily for providing information to the GUI.
    25.9   *
   25.10 @@ -19,9 +19,8 @@
   25.11  #ifndef dream_cpu_H
   25.12  #define dream_cpu_H 1
   25.13  
   25.14 -#include <stdint.h>
   25.15 -#include <stdlib.h>
   25.16 -#include <glib/gtypes.h>
   25.17 +#include "lxdream.h"
   25.18 +#include "mem.h"
   25.19  
   25.20  #ifdef __cplusplus
   25.21  extern "C" {
   25.22 @@ -58,8 +57,8 @@
   25.23      disasm_func_t disasm_func; /* Disassembly function */
   25.24      gboolean (*step_func)(); /* Single step function */
   25.25      int (*is_valid_page_func)(uint32_t); /* Test for valid memory page */
   25.26 -    void (*set_breakpoint)(uint32_t, int);
   25.27 -    gboolean (*clear_breakpoint)(uint32_t, int);
   25.28 +    void (*set_breakpoint)(uint32_t, breakpoint_type_t);
   25.29 +    gboolean (*clear_breakpoint)(uint32_t, breakpoint_type_t);
   25.30      int (*get_breakpoint)(uint32_t);
   25.31      size_t instr_size; /* Size of instruction */
   25.32      char *regs; /* Pointer to start of registers */

    26.1 --- a/src/dcload.c	Thu Dec 20 09:56:07 2007 +0000
    26.2 +++ b/src/dcload.c	Tue Jan 15 20:50:23 2008 +0000
    26.3 @@ -1,5 +1,5 @@
    26.4  /**
    26.5 - * $Id: dcload.c,v 1.8 2007-11-08 11:54:16 nkeynes Exp $
    26.6 + * $Id$
    26.7   * 
    26.8   * DC-load syscall implementation.
    26.9   *
   26.10 @@ -24,7 +24,7 @@
   26.11  #include "mem.h"
   26.12  #include "dreamcast.h"
   26.13  #include "syscall.h"
   26.14 -#include "sh4/sh4core.h"
   26.15 +#include "sh4/sh4.h"
   26.16  
   26.17  #define SYS_READ 0
   26.18  #define SYS_WRITE 1

    27.1 --- a/src/display.c	Thu Dec 20 09:56:07 2007 +0000
    27.2 +++ b/src/display.c	Tue Jan 15 20:50:23 2008 +0000
    27.3 @@ -1,5 +1,5 @@
    27.4  /**
    27.5 - * $Id: display.c,v 1.12 2007-10-31 09:10:23 nkeynes Exp $
    27.6 + * $Id$
    27.7   *
    27.8   * Generic support for keyboard and other input sources. The active display
    27.9   * driver is expected to deliver events here, where they're translated and

    28.1 --- a/src/display.h	Thu Dec 20 09:56:07 2007 +0000
    28.2 +++ b/src/display.h	Tue Jan 15 20:50:23 2008 +0000
    28.3 @@ -1,5 +1,5 @@
    28.4  /**
    28.5 - * $Id: display.h,v 1.12 2007-11-08 11:54:16 nkeynes Exp $
    28.6 + * $Id$
    28.7   *
    28.8   * The PC side of the video support (responsible for actually displaying / 
    28.9   * rendering frames)

    29.1 --- a/src/dream.h	Thu Dec 20 09:56:07 2007 +0000
    29.2 +++ b/src/dream.h	Tue Jan 15 20:50:23 2008 +0000
    29.3 @@ -1,5 +1,5 @@
    29.4  /**
    29.5 - * $Id: dream.h,v 1.17 2007-11-07 11:45:53 nkeynes Exp $
    29.6 + * $Id$
    29.7   *
    29.8   * Miscellaneous application-wide declarations (mainly logging atm)
    29.9   *

    30.1 --- a/src/dreamcast.c	Thu Dec 20 09:56:07 2007 +0000
    30.2 +++ b/src/dreamcast.c	Tue Jan 15 20:50:23 2008 +0000
    30.3 @@ -1,5 +1,5 @@
    30.4  /**
    30.5 - * $Id: dreamcast.c,v 1.28 2007-10-31 11:53:35 nkeynes Exp $
    30.6 + * $Id$
    30.7   * Central switchboard for the system. This pulls all the individual modules
    30.8   * together into some kind of coherent structure. This is also where you'd
    30.9   * add Naomi support, if I ever get a board to play with...
   30.10 @@ -27,6 +27,7 @@
   30.11  #include "dreamcast.h"
   30.12  #include "gdrom/ide.h"
   30.13  #include "maple/maple.h"
   30.14 +#include "sh4/sh4trans.h"
   30.15  
   30.16  /**
   30.17   * Current state of the DC virtual machine
   30.18 @@ -131,6 +132,9 @@
   30.19  void dreamcast_reset( void )
   30.20  {
   30.21      int i;
   30.22 +    if( sh4_xlat_is_running() ) {
   30.23 +	sh4_translate_exit( XLAT_EXIT_SYSRESET );
   30.24 +    }
   30.25      for( i=0; i<num_modules; i++ ) {
   30.26  	if( modules[i]->reset != NULL )
   30.27  	    modules[i]->reset();
   30.28 @@ -201,6 +205,9 @@
   30.29  
   30.30  void dreamcast_stop( void )
   30.31  {
   30.32 +    if( sh4_xlat_is_running() ) {
   30.33 +	sh4_translate_exit( XLAT_EXIT_HALT );
   30.34 +    }
   30.35      if( dreamcast_state == STATE_RUNNING )
   30.36  	dreamcast_state = STATE_STOPPING;
   30.37  }
   30.38 @@ -219,9 +226,7 @@
   30.39      dreamcast_program_name = g_strdup(name);
   30.40      dreamcast_entry_point = entry_point;
   30.41      sh4_set_pc(entry_point);
   30.42 -    if( !dreamcast_has_bios ) {
   30.43 -        bios_install();
   30.44 -    }
   30.45 +    bios_install();
   30.46      dcload_install();
   30.47      gui_update_state();
   30.48  }

    31.1 --- a/src/dreamcast.h	Thu Dec 20 09:56:07 2007 +0000
    31.2 +++ b/src/dreamcast.h	Tue Jan 15 20:50:23 2008 +0000
    31.3 @@ -1,5 +1,5 @@
    31.4  /**
    31.5 - * $Id: dreamcast.h,v 1.22 2007-11-06 08:35:33 nkeynes Exp $
    31.6 + * $Id$
    31.7   *
    31.8   * Public interface for dreamcast.c -
    31.9   * Central switchboard for the system. This pulls all the individual modules
   31.10 @@ -60,7 +60,7 @@
   31.11  void dreamcast_program_loaded( const gchar *name, sh4addr_t entry_point );
   31.12  
   31.13  #define DREAMCAST_SAVE_MAGIC "%!-lxDream!Save\0"
   31.14 -#define DREAMCAST_SAVE_VERSION 0x00010002
   31.15 +#define DREAMCAST_SAVE_VERSION 0x00010003
   31.16  
   31.17  int dreamcast_save_state( const gchar *filename );
   31.18  int dreamcast_load_state( const gchar *filename );

    32.1 --- a/src/drivers/audio_esd.c	Thu Dec 20 09:56:07 2007 +0000
    32.2 +++ b/src/drivers/audio_esd.c	Tue Jan 15 20:50:23 2008 +0000
    32.3 @@ -1,5 +1,5 @@
    32.4  /**
    32.5 - * $Id: audio_esd.c,v 1.9 2007-10-07 05:42:25 nkeynes Exp $
    32.6 + * $Id$
    32.7   * 
    32.8   * The esd (esound) audio driver
    32.9   *

    33.1 --- a/src/drivers/audio_null.c	Thu Dec 20 09:56:07 2007 +0000
    33.2 +++ b/src/drivers/audio_null.c	Tue Jan 15 20:50:23 2008 +0000
    33.3 @@ -1,5 +1,5 @@
    33.4  /**
    33.5 - * $Id: audio_null.c,v 1.3 2006-03-14 12:45:53 nkeynes Exp $
    33.6 + * $Id$
    33.7   * 
    33.8   * The "null" audio driver, which just discards all input without even
    33.9   * looking at it.

    34.1 --- a/src/drivers/cd_linux.c	Thu Dec 20 09:56:07 2007 +0000
    34.2 +++ b/src/drivers/cd_linux.c	Tue Jan 15 20:50:23 2008 +0000
    34.3 @@ -1,5 +1,5 @@
    34.4  /**
    34.5 - * $Id: linux.c,v 1.9 2007-11-04 05:07:49 nkeynes Exp $
    34.6 + * $Id$
    34.7   *
    34.8   * Linux cd-rom device driver. 
    34.9   *

    35.1 --- a/src/drivers/cd_none.c	Thu Dec 20 09:56:07 2007 +0000
    35.2 +++ b/src/drivers/cd_none.c	Tue Jan 15 20:50:23 2008 +0000
    35.3 @@ -1,5 +1,5 @@
    35.4  /**
    35.5 - * $Id: cdnone.c,v 1.1 2007-11-04 05:07:49 nkeynes Exp $
    35.6 + * $Id$
    35.7   *
    35.8   * The "null" cdrom device driver. Just provides a couple of empty stubs.
    35.9   *

    36.1 --- a/src/drivers/gl_common.c	Thu Dec 20 09:56:07 2007 +0000
    36.2 +++ b/src/drivers/gl_common.c	Tue Jan 15 20:50:23 2008 +0000
    36.3 @@ -1,5 +1,5 @@
    36.4  /**
    36.5 - * $Id: gl_common.c,v 1.7 2007-10-31 12:05:23 nkeynes Exp $
    36.6 + * $Id$
    36.7   *
    36.8   * Common GL code that doesn't depend on a specific implementation
    36.9   *
   36.10 @@ -102,11 +102,11 @@
   36.11  {
   36.12      float top, bottom;
   36.13      if( inverted ) {
   36.14 -	top = ((float)height) - 0.5;
   36.15 -	bottom = 0.5;
   36.16 +	top = ((float)height);
   36.17 +	bottom = 0;
   36.18      } else {
   36.19 -	top = 0.5;
   36.20 -	bottom = ((float)height) - 0.5;
   36.21 +	top = 0;
   36.22 +	bottom = ((float)height);
   36.23      }
   36.24  
   36.25      /* Reset display parameters */
   36.26 @@ -156,13 +156,13 @@
   36.27      glEnable( GL_BLEND );
   36.28      glBlendFunc( GL_ONE, GL_ZERO );
   36.29      glBegin( GL_QUADS );
   36.30 -    glTexCoord2f( 0.5, top );
   36.31 +    glTexCoord2f( 0, top );
   36.32      glVertex2f( x1, y1 );
   36.33 -    glTexCoord2f( ((float)width)-0.5, top );
   36.34 +    glTexCoord2f( ((float)width), top );
   36.35      glVertex2f( x2, y1 );
   36.36 -    glTexCoord2f( ((float)width)-0.5, bottom );
   36.37 +    glTexCoord2f( ((float)width), bottom );
   36.38      glVertex2f( x2, y2 );
   36.39 -    glTexCoord2f( 0.5, bottom );
   36.40 +    glTexCoord2f( 0, bottom );
   36.41      glVertex2f( x1, y2 );
   36.42      glEnd();
   36.43      glDisable( GL_TEXTURE_RECTANGLE_ARB );

    37.1 --- a/src/drivers/gl_common.h	Thu Dec 20 09:56:07 2007 +0000
    37.2 +++ b/src/drivers/gl_common.h	Tue Jan 15 20:50:23 2008 +0000
    37.3 @@ -1,5 +1,5 @@
    37.4  /**
    37.5 - * $Id: gl_common.h,v 1.5 2007-10-31 09:10:23 nkeynes Exp $
    37.6 + * $Id$
    37.7   *
    37.8   * Parent for all X11 display drivers.
    37.9   *

    38.1 --- a/src/drivers/gl_fbo.c	Thu Dec 20 09:56:07 2007 +0000
    38.2 +++ b/src/drivers/gl_fbo.c	Tue Jan 15 20:50:23 2008 +0000
    38.3 @@ -1,5 +1,5 @@
    38.4  /**
    38.5 - * $Id: gl_fbo.c,v 1.7 2007-10-31 09:10:23 nkeynes Exp $
    38.6 + * $Id$
    38.7   *
    38.8   * GL framebuffer-based driver shell. This requires the EXT_framebuffer_object
    38.9   * extension, but is much nicer/faster/etc than pbuffers when it's available.

    39.1 --- a/src/drivers/gl_sl.c	Thu Dec 20 09:56:07 2007 +0000
    39.2 +++ b/src/drivers/gl_sl.c	Tue Jan 15 20:50:23 2008 +0000
    39.3 @@ -1,5 +1,5 @@
    39.4  /**
    39.5 - * $Id: gl_sl.c,v 1.3 2007-10-31 09:10:23 nkeynes Exp $
    39.6 + * $Id$
    39.7   *
    39.8   * GLSL shader loader/unloader. Current version assumes there's exactly
    39.9   * 1 shader program that's used globally. This may turn out not to be the

    40.1 --- a/src/drivers/video_glx.c	Thu Dec 20 09:56:07 2007 +0000
    40.2 +++ b/src/drivers/video_glx.c	Tue Jan 15 20:50:23 2008 +0000
    40.3 @@ -1,5 +1,5 @@
    40.4  /**
    40.5 - * $Id: video_x11.c,v 1.20 2007-10-31 12:05:23 nkeynes Exp $
    40.6 + * $Id$
    40.7   *
    40.8   * Shared functions for all X11-based display drivers.
    40.9   *
   40.10 @@ -16,13 +16,12 @@
   40.11   * GNU General Public License for more details.
   40.12   */
   40.13  
   40.14 +#include "display.h"
   40.15 +#include "pvr2/pvr2.h"
   40.16 +#include "drivers/gl_common.h"
   40.17  #include <X11/Xlib.h>
   40.18  #include <GL/glx.h>
   40.19 -#include <GL/gl.h>
   40.20 -#include "dream.h"
   40.21 -#include "pvr2/pvr2.h"
   40.22  #include "drivers/video_glx.h"
   40.23 -#include "drivers/gl_common.h"
   40.24  
   40.25  /**
   40.26   * General X11 parameters. The front-end driver is expected to set this up

    41.1 --- a/src/drivers/video_glx.h	Thu Dec 20 09:56:07 2007 +0000
    41.2 +++ b/src/drivers/video_glx.h	Tue Jan 15 20:50:23 2008 +0000
    41.3 @@ -1,5 +1,5 @@
    41.4  /**
    41.5 - * $Id: video_glx.h,v 1.5 2007-09-08 04:05:35 nkeynes Exp $
    41.6 + * $Id$
    41.7   *
    41.8   * Parent for all glx-based display drivers.
    41.9   *

    42.1 --- a/src/drivers/video_gtk.c	Thu Dec 20 09:56:07 2007 +0000
    42.2 +++ b/src/drivers/video_gtk.c	Tue Jan 15 20:50:23 2008 +0000
    42.3 @@ -1,5 +1,5 @@
    42.4  /**
    42.5 - * $Id: video_gtk.c,v 1.19 2007-10-31 12:43:51 nkeynes Exp $
    42.6 + * $Id$
    42.7   *
    42.8   * The PC side of the video support (responsible for actually displaying / 
    42.9   * rendering frames)
   42.10 @@ -24,6 +24,7 @@
   42.11  #include "display.h"
   42.12  #include "drivers/video_glx.h"
   42.13  #include "drivers/gl_common.h"
   42.14 +#include "pvr2/pvr2.h"
   42.15  #include "gtkui/gtkui.h"
   42.16  
   42.17  static GtkWidget *video_win = NULL;

    43.1 --- a/src/drivers/video_null.c	Thu Dec 20 09:56:07 2007 +0000
    43.2 +++ b/src/drivers/video_null.c	Tue Jan 15 20:50:23 2008 +0000
    43.3 @@ -1,5 +1,5 @@
    43.4  /**
    43.5 - * $Id: video_null.c,v 1.7 2007-10-31 12:05:23 nkeynes Exp $
    43.6 + * $Id$
    43.7   *
    43.8   * Null video output driver (ie no video output whatsoever)
    43.9   *

    44.1 --- a/src/eventq.c	Thu Dec 20 09:56:07 2007 +0000
    44.2 +++ b/src/eventq.c	Tue Jan 15 20:50:23 2008 +0000
    44.3 @@ -1,5 +1,5 @@
    44.4  /**
    44.5 - * $Id: eventq.c,v 1.2 2007-10-06 08:59:42 nkeynes Exp $
    44.6 + * $Id$
    44.7   *
    44.8   * Simple implementation of one-shot timers. Effectively this allows IO
    44.9   * devices to wait until a particular time before completing. We expect 
   44.10 @@ -23,7 +23,7 @@
   44.11  #include "dreamcast.h"
   44.12  #include "eventq.h"
   44.13  #include "asic.h"
   44.14 -#include "sh4core.h"
   44.15 +#include "sh4.h"
   44.16  
   44.17  #define LONG_SCAN_PERIOD 1000000000 /* 1 second */
   44.18  

    45.1 --- a/src/eventq.h	Thu Dec 20 09:56:07 2007 +0000
    45.2 +++ b/src/eventq.h	Tue Jan 15 20:50:23 2008 +0000
    45.3 @@ -1,5 +1,5 @@
    45.4  /**
    45.5 - * $Id: eventq.h,v 1.1 2007-01-06 04:06:36 nkeynes Exp $
    45.6 + * $Id$
    45.7   *
    45.8   * Simple implementation of one-shot timers. Effectively this allows IO
    45.9   * devices to wait until a particular time before completing. We expect 

    46.1 --- a/src/gdrom/cdi.c	Thu Dec 20 09:56:07 2007 +0000
    46.2 +++ b/src/gdrom/cdi.c	Tue Jan 15 20:50:23 2008 +0000
    46.3 @@ -1,5 +1,5 @@
    46.4  /**
    46.5 - * $Id: cdi.c,v 1.10 2007-10-28 07:23:46 nkeynes Exp $
    46.6 + * $Id$
    46.7   *
    46.8   * CDI CD-image file support
    46.9   *

    47.1 --- a/src/gdrom/cdi.h	Thu Dec 20 09:56:07 2007 +0000
    47.2 +++ b/src/gdrom/cdi.h	Tue Jan 15 20:50:23 2008 +0000
    47.3 @@ -1,5 +1,5 @@
    47.4  /**
    47.5 - * $Id: cdi.h,v 1.2 2005-12-25 08:24:11 nkeynes Exp $
    47.6 + * $Id$
    47.7   *
    47.8   * CDI CD-image file support
    47.9   *

    48.1 --- a/src/gdrom/gdi.c	Thu Dec 20 09:56:07 2007 +0000
    48.2 +++ b/src/gdrom/gdi.c	Tue Jan 15 20:50:23 2008 +0000
    48.3 @@ -1,5 +1,5 @@
    48.4  /**
    48.5 - * $Id: gdi.c,v 1.2 2007-11-08 10:48:41 nkeynes Exp $
    48.6 + * $Id$
    48.7   *
    48.8   * NullDC GDI image format
    48.9   *

    49.1 --- a/src/gdrom/gdimage.c	Thu Dec 20 09:56:07 2007 +0000
    49.2 +++ b/src/gdrom/gdimage.c	Tue Jan 15 20:50:23 2008 +0000
    49.3 @@ -1,5 +1,5 @@
    49.4  /**
    49.5 - * $Id: gdimage.c,v 1.7 2007-11-08 10:48:41 nkeynes Exp $
    49.6 + * $Id$
    49.7   *
    49.8   * GD-Rom image-file common functions. 
    49.9   *

    50.1 --- a/src/gdrom/gdrom.c	Thu Dec 20 09:56:07 2007 +0000
    50.2 +++ b/src/gdrom/gdrom.c	Tue Jan 15 20:50:23 2008 +0000
    50.3 @@ -1,6 +1,6 @@
    50.4  
    50.5  /**
    50.6 - * $Id: gdrom.c,v 1.19 2007-11-06 08:35:16 nkeynes Exp $
    50.7 + * $Id$
    50.8   *
    50.9   * GD-Rom  access functions.
   50.10   *

    51.1 --- a/src/gdrom/gdrom.h	Thu Dec 20 09:56:07 2007 +0000
    51.2 +++ b/src/gdrom/gdrom.h	Tue Jan 15 20:50:23 2008 +0000
    51.3 @@ -1,5 +1,5 @@
    51.4  /**
    51.5 - * $Id: gdrom.h,v 1.16 2007-11-06 08:35:16 nkeynes Exp $
    51.6 + * $Id$
    51.7   *
    51.8   * This file defines the structures and functions used by the GD-Rom
    51.9   * disc driver. (ie, the modules that supply a CD image to be used by the

    52.1 --- a/src/gdrom/ide.c	Thu Dec 20 09:56:07 2007 +0000
    52.2 +++ b/src/gdrom/ide.c	Tue Jan 15 20:50:23 2008 +0000
    52.3 @@ -1,5 +1,5 @@
    52.4  /**
    52.5 - * $Id: ide.c,v 1.27 2007-11-06 08:35:33 nkeynes Exp $
    52.6 + * $Id$
    52.7   *
    52.8   * IDE interface implementation
    52.9   *

    53.1 --- a/src/gdrom/ide.h	Thu Dec 20 09:56:07 2007 +0000
    53.2 +++ b/src/gdrom/ide.h	Tue Jan 15 20:50:23 2008 +0000
    53.3 @@ -1,5 +1,5 @@
    53.4  /**
    53.5 - * $Id: ide.h,v 1.14 2007-11-06 08:35:33 nkeynes Exp $
    53.6 + * $Id$
    53.7   *
    53.8   * This file defines the interface and structures of the dreamcast's IDE 
    53.9   * port. Note that the register definitions are in asic.h, as the registers

    54.1 --- a/src/gdrom/nrg.c	Thu Dec 20 09:56:07 2007 +0000
    54.2 +++ b/src/gdrom/nrg.c	Tue Jan 15 20:50:23 2008 +0000
    54.3 @@ -1,5 +1,5 @@
    54.4  /**
    54.5 - * $Id: nrg.c,v 1.7 2007-10-28 07:23:46 nkeynes Exp $
    54.6 + * $Id$
    54.7   *
    54.8   * Nero (NRG) CD file format. File information stolen shamelessly from
    54.9   * libcdio.

    55.1 --- a/src/gdrom/packet.h	Thu Dec 20 09:56:07 2007 +0000
    55.2 +++ b/src/gdrom/packet.h	Tue Jan 15 20:50:23 2008 +0000
    55.3 @@ -1,5 +1,5 @@
    55.4  /**
    55.5 - * $Id: packet.h,v 1.8 2007-11-06 08:35:33 nkeynes Exp $
    55.6 + * $Id$
    55.7   *
    55.8   * This file defines the command codes and any other flags used by the 
    55.9   * GD-Rom ATAPI packet commands.

    56.1 --- a/src/gtkui/ctrl_dlg.c	Thu Dec 20 09:56:07 2007 +0000
    56.2 +++ b/src/gtkui/ctrl_dlg.c	Tue Jan 15 20:50:23 2008 +0000
    56.3 @@ -1,5 +1,5 @@
    56.4  /**
    56.5 - * $Id: ctrl_dlg.c,v 1.6 2007-11-10 04:45:29 nkeynes Exp $
    56.6 + * $Id$
    56.7   *
    56.8   * Define the main (emu) GTK window, along with its menubars,
    56.9   * toolbars, etc.

    57.1 --- a/src/gtkui/debug_win.c	Thu Dec 20 09:56:07 2007 +0000
    57.2 +++ b/src/gtkui/debug_win.c	Tue Jan 15 20:50:23 2008 +0000
    57.3 @@ -1,5 +1,5 @@
    57.4  /**
    57.5 - * $Id: debug_win.c,v 1.29 2007-11-10 04:45:29 nkeynes Exp $
    57.6 + * $Id$
    57.7   * This file is responsible for the main debugger gui frame.
    57.8   *
    57.9   * Copyright (c) 2005 Nathan Keynes.
   57.10 @@ -70,7 +70,7 @@
   57.11          GtkWidget *vbox;
   57.12  
   57.13      data->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   57.14 -    gtk_window_set_default_size (GTK_WINDOW (data->window), 640, 480);
   57.15 +    gtk_window_set_default_size (GTK_WINDOW (data->window), 700, 480);
   57.16      gtk_window_set_title( GTK_WINDOW(data->window), title );
   57.17      gtk_window_add_accel_group (GTK_WINDOW (data->window), accel_group);
   57.18  
   57.19 @@ -79,7 +79,7 @@
   57.20      data->statusbar = gtk_statusbar_new();
   57.21  
   57.22      GtkWidget *hpaned = gtk_hpaned_new ();
   57.23 -    gtk_paned_set_position (GTK_PANED (hpaned), 800);
   57.24 +    gtk_paned_set_position (GTK_PANED (hpaned), 500);
   57.25  
   57.26      GtkWidget *disasm_box = gtk_vbox_new(FALSE,0);
   57.27      gtk_paned_pack1 (GTK_PANED (hpaned), disasm_box, TRUE, TRUE);

    58.1 --- a/src/gtkui/dump_win.c	Thu Dec 20 09:56:07 2007 +0000
    58.2 +++ b/src/gtkui/dump_win.c	Tue Jan 15 20:50:23 2008 +0000
    58.3 @@ -1,5 +1,5 @@
    58.4  /**
    58.5 - * $Id: dump_win.c,v 1.7 2007-10-31 12:23:19 nkeynes Exp $
    58.6 + * $Id$
    58.7   *
    58.8   * Implements the memory dump window.
    58.9   *

    59.1 --- a/src/gtkui/gdrom_menu.c	Thu Dec 20 09:56:07 2007 +0000
    59.2 +++ b/src/gtkui/gdrom_menu.c	Tue Jan 15 20:50:23 2008 +0000
    59.3 @@ -1,5 +1,5 @@
    59.4  /**
    59.5 - * $Id: gdrom_menu.c,v 1.5 2007-11-10 04:45:29 nkeynes Exp $
    59.6 + * $Id$
    59.7   *
    59.8   * Creates and manages the GD-Rom attachment menu.
    59.9   *

    60.1 --- a/src/gtkui/gtkcb.c	Thu Dec 20 09:56:07 2007 +0000
    60.2 +++ b/src/gtkui/gtkcb.c	Tue Jan 15 20:50:23 2008 +0000
    60.3 @@ -1,5 +1,5 @@
    60.4  /**
    60.5 - * $Id: gtkcb.c,v 1.9 2007-11-10 04:45:29 nkeynes Exp $
    60.6 + * $Id$
    60.7   *
    60.8   * Action callbacks from the main window
    60.9   *

    61.1 --- a/src/gtkui/gtkui.c	Thu Dec 20 09:56:07 2007 +0000
    61.2 +++ b/src/gtkui/gtkui.c	Tue Jan 15 20:50:23 2008 +0000
    61.3 @@ -1,5 +1,5 @@
    61.4  /**
    61.5 - * $Id: gtkui.c,v 1.12 2007-11-10 04:45:29 nkeynes Exp $
    61.6 + * $Id$
    61.7   *
    61.8   * Core GTK-based user interface
    61.9   *

    62.1 --- a/src/gtkui/gtkui.h	Thu Dec 20 09:56:07 2007 +0000
    62.2 +++ b/src/gtkui/gtkui.h	Tue Jan 15 20:50:23 2008 +0000
    62.3 @@ -1,5 +1,5 @@
    62.4  /**
    62.5 - * $Id: gtkui.h,v 1.12 2007-11-10 04:45:29 nkeynes Exp $
    62.6 + * $Id$
    62.7   *
    62.8   * Core GTK-based user interface
    62.9   *

    63.1 --- a/src/gtkui/main_win.c	Thu Dec 20 09:56:07 2007 +0000
    63.2 +++ b/src/gtkui/main_win.c	Tue Jan 15 20:50:23 2008 +0000
    63.3 @@ -1,5 +1,5 @@
    63.4  /**
    63.5 - * $Id: main_win.c,v 1.10 2007-11-08 10:46:41 nkeynes Exp $
    63.6 + * $Id$
    63.7   *
    63.8   * Define the main (emu) GTK window, along with its menubars,
    63.9   * toolbars, etc.

    64.1 --- a/src/gtkui/mmio_win.c	Thu Dec 20 09:56:07 2007 +0000
    64.2 +++ b/src/gtkui/mmio_win.c	Tue Jan 15 20:50:23 2008 +0000
    64.3 @@ -1,5 +1,5 @@
    64.4  /**
    64.5 - * $Id: mmio_win.c,v 1.11 2007-11-10 04:45:29 nkeynes Exp $
    64.6 + * $Id$
    64.7   *
    64.8   * Implements the MMIO register viewing window
    64.9   *
   64.10 @@ -121,6 +121,10 @@
   64.11      gtk_container_add( GTK_CONTAINER(vbox), GTK_WIDGET(scroll) );
   64.12  
   64.13      trace_button = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("Trace access")));
   64.14 +    if( io_rgn != NULL ) {
   64.15 +	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(trace_button), 
   64.16 +				     io_rgn->trace_flag ? TRUE : FALSE);
   64.17 +    }
   64.18      gtk_container_add( GTK_CONTAINER(vbox), GTK_WIDGET(trace_button) );
   64.19      gtk_box_set_child_packing( GTK_BOX(vbox), GTK_WIDGET(trace_button), 
   64.20  			       FALSE, FALSE, 0, GTK_PACK_START );

    65.1 --- a/src/gtkui/path_dlg.c	Thu Dec 20 09:56:07 2007 +0000
    65.2 +++ b/src/gtkui/path_dlg.c	Tue Jan 15 20:50:23 2008 +0000
    65.3 @@ -1,5 +1,5 @@
    65.4  /**
    65.5 - * $Id: path_dlg.c,v 1.5 2007-11-10 04:45:29 nkeynes Exp $
    65.6 + * $Id$
    65.7   *
    65.8   * Define the main (emu) GTK window, along with its menubars,
    65.9   * toolbars, etc.

    66.1 --- a/src/gui.h	Thu Dec 20 09:56:07 2007 +0000
    66.2 +++ b/src/gui.h	Tue Jan 15 20:50:23 2008 +0000
    66.3 @@ -1,5 +1,5 @@
    66.4  /**
    66.5 - * $Id: gui.h,v 1.3 2007-10-31 11:53:35 nkeynes Exp $
    66.6 + * $Id$
    66.7   *
    66.8   * Public GUI declarations (used from elsewhere in the system)
    66.9   *

    67.1 --- a/src/loader.c	Thu Dec 20 09:56:07 2007 +0000
    67.2 +++ b/src/loader.c	Tue Jan 15 20:50:23 2008 +0000
    67.3 @@ -1,5 +1,5 @@
    67.4  /**
    67.5 - * $Id: loader.c,v 1.22 2007-11-08 11:54:16 nkeynes Exp $
    67.6 + * $Id$
    67.7   *
    67.8   * File loading routines, mostly for loading demos without going through the
    67.9   * whole procedure of making a CD image for them.

    68.1 --- a/src/loader.h	Thu Dec 20 09:56:07 2007 +0000
    68.2 +++ b/src/loader.h	Tue Jan 15 20:50:23 2008 +0000
    68.3 @@ -1,5 +1,5 @@
    68.4  /**
    68.5 - * $Id: loader.h,v 1.2 2007-10-07 06:21:14 nkeynes Exp $
    68.6 + * $Id$
    68.7   *
    68.8   * Interface declarations for the binary loader routines (loader.c, elf.c)
    68.9   *

    69.1 --- a/src/lxdream.h	Thu Dec 20 09:56:07 2007 +0000
    69.2 +++ b/src/lxdream.h	Tue Jan 15 20:50:23 2008 +0000
    69.3 @@ -1,5 +1,5 @@
    69.4  /**
    69.5 - * $Id: lxdream.h,v 1.4 2007-11-10 04:44:51 nkeynes Exp $
    69.6 + * $Id$
    69.7   *
    69.8   * Common type definitions and forward declarations
    69.9   *
   69.10 @@ -39,9 +39,15 @@
   69.11  #endif
   69.12  
   69.13  /**
   69.14 - * A 32-bit address in SH4 space
   69.15 + * A 29-bit address in SH4 external address space
   69.16   */
   69.17  typedef uint32_t sh4addr_t;
   69.18 +
   69.19 +/**
   69.20 + * A 32-bit address in SH4 virtual address space.
   69.21 + */
   69.22 +typedef uint32_t sh4vma_t;
   69.23 +
   69.24  /**
   69.25   * A direct pointer into SH4 memory
   69.26   */
   69.27 @@ -67,6 +73,7 @@
   69.28  #define MODULE_NAME "*****"
   69.29  #endif
   69.30  
   69.31 +gboolean set_global_log_level( const gchar *level );
   69.32  void log_message( void *, int level, const char *source, const char *msg, ... );
   69.33  
   69.34  #define FATAL( ... ) log_message( NULL, EMIT_FATAL, MODULE_NAME, __VA_ARGS__ )

    70.1 --- a/src/main.c	Thu Dec 20 09:56:07 2007 +0000
    70.2 +++ b/src/main.c	Tue Jan 15 20:50:23 2008 +0000
    70.3 @@ -1,5 +1,5 @@
    70.4  /**
    70.5 - * $Id: main.c,v 1.35 2007-11-07 11:45:53 nkeynes Exp $
    70.6 + * $Id$
    70.7   *
    70.8   * Main program, initializes dreamcast and gui, then passes control off to
    70.9   * the main loop. 
   70.10 @@ -30,18 +30,20 @@
   70.11  #include "aica/audio.h"
   70.12  #include "gdrom/gdrom.h"
   70.13  #include "maple/maple.h"
   70.14 -#include "sh4/sh4core.h"
   70.15 +#include "sh4/sh4.h"
   70.16  
   70.17  #define S3M_PLAYER "s3mplay.bin"
   70.18  
   70.19 -char *option_list = "a:m:s:A:V:puhbd:c:t:xD";
   70.20 +char *option_list = "a:m:s:A:V:v:puhbd:c:t:T:xDn";
   70.21  struct option longopts[1] = { { NULL, 0, 0, 0 } };
   70.22  char *aica_program = NULL;
   70.23  char *s3m_file = NULL;
   70.24  const char *disc_file = NULL;
   70.25  char *display_driver_name = NULL;
   70.26  char *audio_driver_name = NULL;
   70.27 +char *trace_regions = NULL;
   70.28  gboolean start_immediately = FALSE;
   70.29 +gboolean no_start = FALSE;
   70.30  gboolean headless = FALSE;
   70.31  gboolean without_bios = FALSE;
   70.32  gboolean use_xlat = TRUE;
   70.33 @@ -82,6 +84,10 @@
   70.34  	    t = strtod(optarg, NULL);
   70.35  	    sh4_cpu_multiplier = (int)(1000.0/t);
   70.36  	    break;
   70.37 +	case 'n': /* Don't start immediately */
   70.38 +	    no_start = TRUE;
   70.39 +	    start_immediately = FALSE;
   70.40 +	    break;
   70.41  	case 's': /* AICA-only w/ S3M player */
   70.42  	    aica_program = S3M_PLAYER;
   70.43  	    s3m_file = optarg;
   70.44 @@ -94,6 +100,7 @@
   70.45  	    break;
   70.46  	case 'p': /* Start immediately */
   70.47  	    start_immediately = TRUE;
   70.48 +	    no_start = FALSE;
   70.49      	    break;
   70.50  	case 'u': /* Allow unsafe dcload syscalls */
   70.51  	    dcload_set_allow_unsafe(TRUE);
   70.52 @@ -109,6 +116,14 @@
   70.53  	    time_secs = (uint32_t)t;
   70.54  	    time_nanos = (int)((t - time_secs) * 1000000000);
   70.55  	    break;
   70.56 +	case 'T': /* trace regions */
   70.57 +	    trace_regions = optarg;
   70.58 +	    break;
   70.59 +	case 'v': /* Log verbosity */
   70.60 +	    if( !set_global_log_level(optarg) ) {
   70.61 +		ERROR( "Unrecognized log level '%s'", optarg );
   70.62 +	    }
   70.63 +	    break;
   70.64  	case 'x': /* Disable translator */
   70.65  	    use_xlat = FALSE;
   70.66  	    break;
   70.67 @@ -126,6 +141,7 @@
   70.68  	    mem_load_block( s3m_file, 0x00810000, 2048*1024 - 0x10000 );
   70.69  	}
   70.70      }
   70.71 +    mem_set_trace( trace_regions, TRUE );
   70.72  
   70.73      if( without_bios ) {
   70.74      	bios_install();
   70.75 @@ -169,7 +185,9 @@
   70.76  	if( !ok ) {
   70.77  	    ERROR( "Unrecognized file '%s'", argv[optind] );
   70.78  	}
   70.79 -	start_immediately = ok;
   70.80 +	if( !no_start ) {
   70.81 +	    start_immediately = ok;
   70.82 +	}
   70.83      }
   70.84  
   70.85      if( disc_file != NULL ) {

    71.1 --- a/src/maple/controller.c	Thu Dec 20 09:56:07 2007 +0000
    71.2 +++ b/src/maple/controller.c	Tue Jan 15 20:50:23 2008 +0000
    71.3 @@ -1,5 +1,5 @@
    71.4  /**
    71.5 - * $Id: controller.c,v 1.10 2007-11-08 11:54:16 nkeynes Exp $
    71.6 + * $Id$
    71.7   *
    71.8   * Implements the standard dreamcast controller
    71.9   *

    72.1 --- a/src/maple/controller.h	Thu Dec 20 09:56:07 2007 +0000
    72.2 +++ b/src/maple/controller.h	Tue Jan 15 20:50:23 2008 +0000
    72.3 @@ -1,5 +1,5 @@
    72.4  /**
    72.5 - * $Id: controller.h,v 1.3 2006-05-20 02:40:51 nkeynes Exp $
    72.6 + * $Id$
    72.7   *
    72.8   * Definitions for the standard controller device
    72.9   *

    73.1 --- a/src/maple/maple.c	Thu Dec 20 09:56:07 2007 +0000
    73.2 +++ b/src/maple/maple.c	Tue Jan 15 20:50:23 2008 +0000
    73.3 @@ -1,5 +1,5 @@
    73.4  /**
    73.5 - * $Id: maple.c,v 1.13 2007-11-06 12:23:25 nkeynes Exp $
    73.6 + * $Id$
    73.7   *
    73.8   * Implements the core Maple bus, including DMA transfers to and from the bus.
    73.9   *

    74.1 --- a/src/maple/maple.h	Thu Dec 20 09:56:07 2007 +0000
    74.2 +++ b/src/maple/maple.h	Tue Jan 15 20:50:23 2008 +0000
    74.3 @@ -1,5 +1,5 @@
    74.4  /**
    74.5 - * $Id: maple.h,v 1.10 2007-11-08 11:54:16 nkeynes Exp $
    74.6 + * $Id$
    74.7   *
    74.8   * Maple bus definitions
    74.9   *

    75.1 --- a/src/mem.c	Thu Dec 20 09:56:07 2007 +0000
    75.2 +++ b/src/mem.c	Tue Jan 15 20:50:23 2008 +0000
    75.3 @@ -1,5 +1,5 @@
    75.4  /**
    75.5 - * $Id: mem.c,v 1.23 2007-11-14 10:21:33 nkeynes Exp $
    75.6 + * $Id$
    75.7   * mem.c is responsible for creating and maintaining the overall system memory
    75.8   * map, as visible from the SH4 processor. 
    75.9   *
   75.10 @@ -20,6 +20,7 @@
   75.11  #include <sys/types.h>
   75.12  #include <sys/mman.h>
   75.13  #include <sys/stat.h>
   75.14 +#include <glib/gstrfuncs.h>
   75.15  #include <assert.h>
   75.16  #include <stdint.h>
   75.17  #include <stdlib.h>
   75.18 @@ -280,7 +281,7 @@
   75.19  	    ERROR( "Unable to allocate ROM memory: %s (%s)", file, strerror(errno) );
   75.20  	    return FALSE;
   75.21  	}
   75.22 -	mem_map_region( mem, base, size, file, MEM_FLAG_ROM, size, base );
   75.23 +	mem_map_region( mem, base, size, region_name, MEM_FLAG_ROM, size, base );
   75.24      } else {
   75.25  	mprotect( mem, size, PROT_READ|PROT_WRITE );
   75.26      }
   75.27 @@ -377,10 +378,39 @@
   75.28      }
   75.29  }
   75.30  
   75.31 -void mem_set_trace( uint32_t addr, int flag )
   75.32 +struct mmio_region *mem_get_io_region_by_name( const gchar *name )
   75.33  {
   75.34 -    struct mmio_region *region = mem_get_io_region(addr);
   75.35 -    if( region != NULL )
   75.36 -	region->trace_flag = flag;
   75.37 +    int i;
   75.38 +    for( i=0; i<num_io_rgns; i++ ) {
   75.39 +	if( strcasecmp(io_rgn[i]->id, name) == 0 ) {
   75.40 +	    return io_rgn[i];
   75.41 +	}
   75.42 +    }
   75.43 +    return NULL;
   75.44  }
   75.45  
   75.46 +void mem_set_trace( const gchar *tracelist, gboolean flag )
   75.47 +{
   75.48 +    if( tracelist != NULL ) {
   75.49 +	gchar ** tracev = g_strsplit_set( tracelist, ",:; \t\r\n", 0 );
   75.50 +	int i;
   75.51 +	for( i=0; tracev[i] != NULL; i++ ) {
   75.52 +	    // Special case "all" - trace everything
   75.53 +	    if( strcasecmp(tracev[i], "all") == 0 ) {
   75.54 +		int j;
   75.55 +		for( j=0; j<num_io_rgns; j++ ) {
   75.56 +		    io_rgn[j]->trace_flag = flag ? 1 : 0;
   75.57 +		}
   75.58 +		break;
   75.59 +	    }
   75.60 +	    struct mmio_region *region = mem_get_io_region_by_name( tracev[i] );
   75.61 +	    if( region == NULL ) {
   75.62 +		WARN( "Unknown IO region '%s'", tracev[i] );
   75.63 +	    } else {
   75.64 +		region->trace_flag = flag ? 1 : 0;
   75.65 +	    }
   75.66 +	}
   75.67 +	g_strfreev( tracev );
   75.68 +    }
   75.69 +}
   75.70 +

    76.1 --- a/src/mem.h	Thu Dec 20 09:56:07 2007 +0000
    76.2 +++ b/src/mem.h	Tue Jan 15 20:50:23 2008 +0000
    76.3 @@ -1,5 +1,5 @@
    76.4  /**
    76.5 - * $Id: mem.h,v 1.17 2007-11-14 10:21:33 nkeynes Exp $
    76.6 + * $Id$
    76.7   *
    76.8   * mem is responsible for creating and maintaining the overall system memory
    76.9   * map, as visible from the SH4 processor. (Note the ARM has a different map)
   76.10 @@ -63,7 +63,7 @@
   76.11  sh4ptr_t mem_get_page( uint32_t addr );
   76.12  int mem_load_block( const gchar *filename, uint32_t base, uint32_t size );
   76.13  int mem_save_block( const gchar *filename, uint32_t base, uint32_t size );
   76.14 -void mem_set_trace( uint32_t addr, int flag );
   76.15 +void mem_set_trace( const gchar *tracelist, int flag );
   76.16  void mem_init( void );
   76.17  void mem_reset( void );
   76.18  void mem_copy_from_sh4( sh4ptr_t dest, sh4addr_t src, size_t count );
   76.19 @@ -71,25 +71,23 @@
   76.20  
   76.21  #define ENABLE_DEBUG_MODE 1
   76.22  
   76.23 +typedef enum { BREAK_NONE=0, BREAK_ONESHOT=1, BREAK_KEEP=2 } breakpoint_type_t;
   76.24 +
   76.25  struct breakpoint_struct {
   76.26      uint32_t address;
   76.27 -    int type;
   76.28 +    breakpoint_type_t type;
   76.29  };
   76.30  
   76.31  #define MAX_BREAKPOINTS 32
   76.32 -#define BREAK_NONE 0
   76.33 -#define BREAK_ONESHOT 1
   76.34 -#define BREAK_KEEP 2
   76.35  
   76.36 -#undef ENABLE_WATCH
   76.37 +
   76.38 +#define MEM_FLAG_ROM 4 /* Mem region is ROM-based */
   76.39 +#define MEM_FLAG_RAM 6 
   76.40  
   76.41  #define WATCH_WRITE 1
   76.42  #define WATCH_READ  2
   76.43  #define WATCH_EXEC  3  /* AKA Breakpoint :) */
   76.44  
   76.45 -#define MEM_FLAG_ROM 4 /* Mem region is ROM-based */
   76.46 -#define MEM_FLAG_RAM 6 
   76.47 -
   76.48  typedef struct watch_point *watch_point_t;
   76.49  
   76.50  watch_point_t mem_new_watch( uint32_t start, uint32_t end, int flags );

    77.1 --- a/src/mmio.h	Thu Dec 20 09:56:07 2007 +0000
    77.2 +++ b/src/mmio.h	Tue Jan 15 20:50:23 2008 +0000
    77.3 @@ -1,5 +1,5 @@
    77.4  /**
    77.5 - * $Id: mmio.h,v 1.8 2007-11-04 08:49:18 nkeynes Exp $
    77.6 + * $Id$
    77.7   *
    77.8   * mmio.h defines a complicated batch of macros used to build up the 
    77.9   * memory-mapped I/O regions in a reasonably readable fashion.

    78.1 --- a/src/pvr2/pvr2.c	Thu Dec 20 09:56:07 2007 +0000
    78.2 +++ b/src/pvr2/pvr2.c	Tue Jan 15 20:50:23 2008 +0000
    78.3 @@ -1,5 +1,5 @@
    78.4  /**
    78.5 - * $Id: pvr2.c,v 1.50 2007-11-14 10:23:28 nkeynes Exp $
    78.6 + * $Id$
    78.7   *
    78.8   * PVR2 (Video) Core module implementation and MMIO registers.
    78.9   *
   78.10 @@ -25,7 +25,7 @@
   78.11  #include "asic.h"
   78.12  #include "clock.h"
   78.13  #include "pvr2/pvr2.h"
   78.14 -#include "sh4/sh4core.h"
   78.15 +#include "sh4/sh4.h"
   78.16  #define MMIO_IMPL
   78.17  #include "pvr2/pvr2mmio.h"
   78.18  

    79.1 --- a/src/pvr2/pvr2.h	Thu Dec 20 09:56:07 2007 +0000
    79.2 +++ b/src/pvr2/pvr2.h	Tue Jan 15 20:50:23 2008 +0000
    79.3 @@ -1,5 +1,5 @@
    79.4  /**
    79.5 - * $Id: pvr2.h,v 1.38 2007-10-31 12:05:23 nkeynes Exp $
    79.6 + * $Id$
    79.7   *
    79.8   * PVR2 (video chip) functions and macros.
    79.9   *

    80.1 --- a/src/pvr2/pvr2mem.c	Thu Dec 20 09:56:07 2007 +0000
    80.2 +++ b/src/pvr2/pvr2mem.c	Tue Jan 15 20:50:23 2008 +0000
    80.3 @@ -1,5 +1,5 @@
    80.4  /**
    80.5 - * $Id: pvr2mem.c,v 1.12 2007-11-08 11:54:16 nkeynes Exp $
    80.6 + * $Id$
    80.7   *
    80.8   * PVR2 (Video) VRAM handling routines (mainly for the 64-bit region)
    80.9   *

    81.1 --- a/src/pvr2/pvr2mmio.h	Thu Dec 20 09:56:07 2007 +0000
    81.2 +++ b/src/pvr2/pvr2mmio.h	Tue Jan 15 20:50:23 2008 +0000
    81.3 @@ -1,5 +1,5 @@
    81.4  /**
    81.5 - * $Id: pvr2mmio.h,v 1.9 2007-01-27 06:21:35 nkeynes Exp $
    81.6 + * $Id$
    81.7   *
    81.8   * PVR2 (video chip) MMIO register definitions.
    81.9   *

    82.1 --- a/src/pvr2/rendbkg.c	Thu Dec 20 09:56:07 2007 +0000
    82.2 +++ b/src/pvr2/rendbkg.c	Tue Jan 15 20:50:23 2008 +0000
    82.3 @@ -1,5 +1,5 @@
    82.4  /**
    82.5 - * $Id: rendbkg.c,v 1.7 2007-10-08 11:52:13 nkeynes Exp $
    82.6 + * $Id$
    82.7   *
    82.8   * PVR2 background renderer. 
    82.9   *

    83.1 --- a/src/pvr2/rendcore.c	Thu Dec 20 09:56:07 2007 +0000
    83.2 +++ b/src/pvr2/rendcore.c	Tue Jan 15 20:50:23 2008 +0000
    83.3 @@ -1,5 +1,5 @@
    83.4  /**
    83.5 - * $Id: rendcore.c,v 1.21 2007-10-31 09:10:23 nkeynes Exp $
    83.6 + * $Id$
    83.7   *
    83.8   * PVR2 renderer core.
    83.9   *

    84.1 --- a/src/pvr2/render.c	Thu Dec 20 09:56:07 2007 +0000
    84.2 +++ b/src/pvr2/render.c	Tue Jan 15 20:50:23 2008 +0000
    84.3 @@ -1,5 +1,5 @@
    84.4  /**
    84.5 - * $Id: render.c,v 1.26 2007-10-31 09:10:23 nkeynes Exp $
    84.6 + * $Id$
    84.7   *
    84.8   * PVR2 Renderer support. This part is primarily
    84.9   *

    85.1 --- a/src/pvr2/rendsave.c	Thu Dec 20 09:56:07 2007 +0000
    85.2 +++ b/src/pvr2/rendsave.c	Tue Jan 15 20:50:23 2008 +0000
    85.3 @@ -1,5 +1,5 @@
    85.4  /**
    85.5 - * $Id: rendsave.c,v 1.2 2007-10-08 11:52:13 nkeynes Exp $
    85.6 + * $Id$
    85.7   *
    85.8   * Scene-save support. This is mainly for test/debug purposes.
    85.9   *

    86.1 --- a/src/pvr2/rendsort.c	Thu Dec 20 09:56:07 2007 +0000
    86.2 +++ b/src/pvr2/rendsort.c	Tue Jan 15 20:50:23 2008 +0000
    86.3 @@ -1,5 +1,5 @@
    86.4  /**
    86.5 - * $Id: rendsort.c,v 1.6 2007-10-08 11:52:13 nkeynes Exp $
    86.6 + * $Id$
    86.7   *
    86.8   * PVR2 renderer routines for depth sorted polygons
    86.9   *

    87.1 --- a/src/pvr2/tacore.c	Thu Dec 20 09:56:07 2007 +0000
    87.2 +++ b/src/pvr2/tacore.c	Tue Jan 15 20:50:23 2008 +0000
    87.3 @@ -1,5 +1,5 @@
    87.4  /**
    87.5 - * $Id: tacore.c,v 1.12 2007-10-08 11:52:13 nkeynes Exp $
    87.6 + * $Id$
    87.7   *
    87.8   * PVR2 Tile Accelerator implementation
    87.9   *

    88.1 --- a/src/pvr2/texcache.c	Thu Dec 20 09:56:07 2007 +0000
    88.2 +++ b/src/pvr2/texcache.c	Tue Jan 15 20:50:23 2008 +0000
    88.3 @@ -1,5 +1,5 @@
    88.4  /**
    88.5 - * $Id: texcache.c,v 1.29 2007-10-31 09:10:23 nkeynes Exp $
    88.6 + * $Id$
    88.7   *
    88.8   * Texture cache. Responsible for maintaining a working set of OpenGL 
    88.9   * textures. 

    89.1 --- a/src/pvr2/yuv.c	Thu Dec 20 09:56:07 2007 +0000
    89.2 +++ b/src/pvr2/yuv.c	Tue Jan 15 20:50:23 2008 +0000
    89.3 @@ -1,5 +1,5 @@
    89.4  /**
    89.5 - * $Id: yuv.c,v 1.5 2007-10-08 11:52:13 nkeynes Exp $
    89.6 + * $Id$
    89.7   *
    89.8   * YUV420 and YUV422 decoding
    89.9   *

    90.1 --- a/src/serial.h	Thu Dec 20 09:56:07 2007 +0000
    90.2 +++ b/src/serial.h	Tue Jan 15 20:50:23 2008 +0000
    90.3 @@ -1,5 +1,5 @@
    90.4  /**
    90.5 - * $Id: serial.h,v 1.1 2005-12-22 07:38:06 nkeynes Exp $
    90.6 + * $Id$
    90.7   * External interface to the dreamcast serial port, implemented by 
    90.8   * sh4/scif.c
    90.9   *

    91.1 --- a/src/sh4/Makefile	Thu Dec 20 09:56:07 2007 +0000
    91.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    91.3 @@ -1,438 +0,0 @@
    91.4 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
    91.5 -# src/sh4/Makefile.  Generated from Makefile.in by configure.
    91.6 -
    91.7 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    91.8 -# Free Software Foundation, Inc.
    91.9 -# This Makefile.in is free software; the Free Software Foundation
   91.10 -# gives unlimited permission to copy and/or distribute it,
   91.11 -# with or without modifications, as long as this notice is preserved.
   91.12 -
   91.13 -# This program is distributed in the hope that it will be useful,
   91.14 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
   91.15 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
   91.16 -# PARTICULAR PURPOSE.
   91.17 -
   91.18 -
   91.19 -
   91.20 -srcdir = .
   91.21 -top_srcdir = ../..
   91.22 -
   91.23 -pkgdatadir = $(datadir)/DreamOn
   91.24 -pkglibdir = $(libdir)/DreamOn
   91.25 -pkgincludedir = $(includedir)/DreamOn
   91.26 -top_builddir = ../..
   91.27 -
   91.28 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
   91.29 -INSTALL = /usr/bin/install -c
   91.30 -install_sh_DATA = $(install_sh) -c -m 644
   91.31 -install_sh_PROGRAM = $(install_sh) -c
   91.32 -install_sh_SCRIPT = $(install_sh) -c
   91.33 -INSTALL_HEADER = $(INSTALL_DATA)
   91.34 -transform = $(program_transform_name)
   91.35 -NORMAL_INSTALL = :
   91.36 -PRE_INSTALL = :
   91.37 -POST_INSTALL = :
   91.38 -NORMAL_UNINSTALL = :
   91.39 -PRE_UNINSTALL = :
   91.40 -POST_UNINSTALL = :
   91.41 -host_triplet = i686-pc-linux-gnu
   91.42 -ACLOCAL = ${SHELL} /usr/home/nkeynes/src/dream/missing --run aclocal-1.7 -I macros
   91.43 -ALLOCA = 
   91.44 -AMDEP_FALSE = #
   91.45 -AMDEP_TRUE = 
   91.46 -AMTAR = ${SHELL} /usr/home/nkeynes/src/dream/missing --run tar
   91.47 -AUTOCONF = ${SHELL} /usr/home/nkeynes/src/dream/missing --run autoconf
   91.48 -AUTOHEADER = ${SHELL} /usr/home/nkeynes/src/dream/missing --run autoheader
   91.49 -AUTOMAKE = ${SHELL} /usr/home/nkeynes/src/dream/missing --run automake-1.7
   91.50 -AWK = gawk
   91.51 -BUILD_INCLUDED_LIBINTL = no
   91.52 -CATOBJEXT = .gmo
   91.53 -CC = gcc
   91.54 -CCDEPMODE = depmode=gcc3
   91.55 -CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations 
   91.56 -CPP = gcc -E
   91.57 -CPPFLAGS =  -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
   91.58 -CYGPATH_W = echo
   91.59 -DATADIRNAME = share
   91.60 -DEFS = -DHAVE_CONFIG_H
   91.61 -DEPDIR = .deps
   91.62 -ECHO_C = 
   91.63 -ECHO_N = -n
   91.64 -ECHO_T = 
   91.65 -EGREP = grep -E
   91.66 -EXEEXT = 
   91.67 -GENCAT = gencat
   91.68 -GLIBC21 = yes
   91.69 -GMSGFMT = /usr/bin/msgfmt
   91.70 -GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-3 -lglib
   91.71 -GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-3 -lglib
   91.72 -GNOME_APPLETS_LIBS = 
   91.73 -GNOME_CAPPLET_LIBS = 
   91.74 -GNOME_CONFIG = /usr/bin/gnome-config
   91.75 -GNOME_DOCKLETS_LIBS = 
   91.76 -GNOME_INCLUDEDIR = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
   91.77 -GNOME_LIBDIR = -rdynamic -L/usr/lib -L/usr/X11R6/lib
   91.78 -GNOME_LIBS = -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-3 -lglib
   91.79 -GNORBA_CFLAGS = -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 -I/usr/include/gtk-1.2
   91.80 -GNORBA_LIBS = -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb-3 -lglib
   91.81 -GTKXMHTML_LIBS = -rdynamic -lgtkxmhtml -lXpm -ljpeg -lpng10 -lz -lSM -lICE -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
   91.82 -GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
   91.83 -GTK_CONFIG = /usr/bin/gtk-config
   91.84 -GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
   91.85 -HAVE_ASPRINTF = 1
   91.86 -HAVE_GNORBA_FALSE = #
   91.87 -HAVE_GNORBA_TRUE = 
   91.88 -HAVE_ORBIT_FALSE = #
   91.89 -HAVE_ORBIT_TRUE = 
   91.90 -HAVE_POSIX_PRINTF = 1
   91.91 -HAVE_SNPRINTF = 1
   91.92 -HAVE_WPRINTF = 0
   91.93 -INSIDE_GNOME_COMMON_FALSE = 
   91.94 -INSIDE_GNOME_COMMON_TRUE = #
   91.95 -INSTALL_DATA = ${INSTALL} -m 644
   91.96 -INSTALL_PROGRAM = ${INSTALL}
   91.97 -INSTALL_SCRIPT = ${INSTALL}
   91.98 -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
   91.99 -INSTOBJEXT = .mo
  91.100 -INTLBISON = bison
  91.101 -INTLLIBS = 
  91.102 -INTLOBJS = 
  91.103 -INTL_LIBTOOL_SUFFIX_PREFIX = 
  91.104 -LDFLAGS = 
  91.105 -LIBICONV = 
  91.106 -LIBINTL = 
  91.107 -LIBOBJS = 
  91.108 -LIBS = 
  91.109 -LTLIBICONV = 
  91.110 -LTLIBINTL = 
  91.111 -LTLIBOBJS = 
  91.112 -MAKEINFO = ${SHELL} /usr/home/nkeynes/src/dream/missing --run makeinfo
  91.113 -MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
  91.114 -MSGFMT = /usr/bin/msgfmt
  91.115 -MSGMERGE = /usr/bin/msgmerge
  91.116 -OBJEXT = o
  91.117 -ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0
  91.118 -ORBIT_CONFIG = /usr/bin/orbit-config
  91.119 -ORBIT_IDL = /usr/bin/orbit-idl
  91.120 -ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm
  91.121 -PACKAGE = DreamOn
  91.122 -PACKAGE_BUGREPORT = 
  91.123 -PACKAGE_NAME = 
  91.124 -PACKAGE_STRING = 
  91.125 -PACKAGE_TARNAME = 
  91.126 -PACKAGE_VERSION = 
  91.127 -PATH_SEPARATOR = :
  91.128 -POSUB = po
  91.129 -PTHREAD_LIB = -lpthread
  91.130 -RANLIB = ranlib
  91.131 -SET_MAKE = 
  91.132 -SHELL = /bin/sh
  91.133 -STRIP = 
  91.134 -USE_INCLUDED_LIBINTL = no
  91.135 -USE_NLS = yes
  91.136 -VERSION = 0.01
  91.137 -XGETTEXT = /usr/bin/xgettext
  91.138 -XPM_LIBS = -lXpm
  91.139 -ZVT_LIBS = -rdynamic -lzvt -lutil -lSM -lICE -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
  91.140 -ac_ct_CC = gcc
  91.141 -ac_ct_RANLIB = ranlib
  91.142 -ac_ct_STRIP = 
  91.143 -am__fastdepCC_FALSE = #
  91.144 -am__fastdepCC_TRUE = 
  91.145 -am__include = include
  91.146 -am__leading_dot = .
  91.147 -am__quote = 
  91.148 -bindir = ${exec_prefix}/bin
  91.149 -build = i686-pc-linux-gnu
  91.150 -build_alias = 
  91.151 -build_cpu = i686
  91.152 -build_os = linux-gnu
  91.153 -build_vendor = pc
  91.154 -cflags_set = yes
  91.155 -datadir = ${prefix}/share
  91.156 -exec_prefix = ${prefix}
  91.157 -host = i686-pc-linux-gnu
  91.158 -host_alias = 
  91.159 -host_cpu = i686
  91.160 -host_os = linux-gnu
  91.161 -host_vendor = pc
  91.162 -includedir = ${prefix}/include
  91.163 -infodir = ${prefix}/info
  91.164 -install_sh = /usr/home/nkeynes/src/dream/install-sh
  91.165 -libdir = ${exec_prefix}/lib
  91.166 -libexecdir = ${exec_prefix}/libexec
  91.167 -localstatedir = ${prefix}/var
  91.168 -mandir = ${prefix}/man
  91.169 -oldincludedir = /usr/include
  91.170 -prefix = /usr/local
  91.171 -program_transform_name = s,x,x,
  91.172 -sbindir = ${exec_prefix}/sbin
  91.173 -sharedstatedir = ${prefix}/com
  91.174 -sysconfdir = ${prefix}/etc
  91.175 -target_alias = 
  91.176 -
  91.177 -INCLUDES = \
  91.178 -	-I$(top_srcdir)/intl -I$(top_srcdir)/src
  91.179 -
  91.180 -
  91.181 -noinst_LIBRARIES = libsh4.a
  91.182 -libsh4_a_SOURCES = mem.c mem.h sh4core.c sh4core.h sh4dasm.c sh4dasm.h \
  91.183 -                   sh4mmio.c sh4mmio.h mmio.h intc.c intc.h
  91.184 -
  91.185 -
  91.186 -AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
  91.187 -subdir = src/sh4
  91.188 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  91.189 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  91.190 -CONFIG_HEADER = $(top_builddir)/config.h
  91.191 -CONFIG_CLEAN_FILES =
  91.192 -LIBRARIES = $(noinst_LIBRARIES)
  91.193 -
  91.194 -libsh4_a_AR = $(AR) cru
  91.195 -libsh4_a_LIBADD =
  91.196 -am_libsh4_a_OBJECTS = mem.$(OBJEXT) sh4core.$(OBJEXT) sh4dasm.$(OBJEXT) \
  91.197 -	sh4mmio.$(OBJEXT) intc.$(OBJEXT)
  91.198 -libsh4_a_OBJECTS = $(am_libsh4_a_OBJECTS)
  91.199 -
  91.200 -DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  91.201 -depcomp = $(SHELL) $(top_srcdir)/depcomp
  91.202 -am__depfiles_maybe = depfiles
  91.203 -DEP_FILES = ./$(DEPDIR)/intc.Po ./$(DEPDIR)/mem.Po \
  91.204 -	./$(DEPDIR)/sh4core.Po ./$(DEPDIR)/sh4dasm.Po \
  91.205 -	./$(DEPDIR)/sh4mmio.Po
  91.206 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  91.207 -	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  91.208 -CCLD = $(CC)
  91.209 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  91.210 -DIST_SOURCES = $(libsh4_a_SOURCES)
  91.211 -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
  91.212 -SOURCES = $(libsh4_a_SOURCES)
  91.213 -
  91.214 -all: all-am
  91.215 -
  91.216 -.SUFFIXES:
  91.217 -.SUFFIXES: .c .o .obj
  91.218 -$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
  91.219 -	cd $(top_srcdir) && \
  91.220 -	  $(AUTOMAKE) --gnu  src/sh4/Makefile
  91.221 -Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  91.222 -	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  91.223 -
  91.224 -AR = ar
  91.225 -
  91.226 -clean-noinstLIBRARIES:
  91.227 -	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
  91.228 -libsh4.a: $(libsh4_a_OBJECTS) $(libsh4_a_DEPENDENCIES) 
  91.229 -	-rm -f libsh4.a
  91.230 -	$(libsh4_a_AR) libsh4.a $(libsh4_a_OBJECTS) $(libsh4_a_LIBADD)
  91.231 -	$(RANLIB) libsh4.a
  91.232 -
  91.233 -mostlyclean-compile:
  91.234 -	-rm -f *.$(OBJEXT) core *.core
  91.235 -
  91.236 -distclean-compile:
  91.237 -	-rm -f *.tab.c
  91.238 -
  91.239 -include ./$(DEPDIR)/intc.Po
  91.240 -include ./$(DEPDIR)/mem.Po
  91.241 -include ./$(DEPDIR)/sh4core.Po
  91.242 -include ./$(DEPDIR)/sh4dasm.Po
  91.243 -include ./$(DEPDIR)/sh4mmio.Po
  91.244 -
  91.245 -.c.o:
  91.246 -	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
  91.247 -	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
  91.248 -	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
  91.249 -	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
  91.250 -	fi
  91.251 -#	source='$<' object='$@' libtool=no \
  91.252 -#	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
  91.253 -#	$(CCDEPMODE) $(depcomp) \
  91.254 -#	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
  91.255 -
  91.256 -.c.obj:
  91.257 -	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
  91.258 -	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
  91.259 -	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
  91.260 -	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
  91.261 -	fi
  91.262 -#	source='$<' object='$@' libtool=no \
  91.263 -#	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
  91.264 -#	$(CCDEPMODE) $(depcomp) \
  91.265 -#	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
  91.266 -uninstall-info-am:
  91.267 -
  91.268 -ETAGS = etags
  91.269 -ETAGSFLAGS =
  91.270 -
  91.271 -CTAGS = ctags
  91.272 -CTAGSFLAGS =
  91.273 -
  91.274 -tags: TAGS
  91.275 -
  91.276 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  91.277 -	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  91.278 -	unique=`for i in $$list; do \
  91.279 -	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  91.280 -	  done | \
  91.281 -	  $(AWK) '    { files[$$0] = 1; } \
  91.282 -	       END { for (i in files) print i; }'`; \
  91.283 -	mkid -fID $$unique
  91.284 -
  91.285 -TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  91.286 -		$(TAGS_FILES) $(LISP)
  91.287 -	tags=; \
  91.288 -	here=`pwd`; \
  91.289 -	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  91.290 -	unique=`for i in $$list; do \
  91.291 -	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  91.292 -	  done | \
  91.293 -	  $(AWK) '    { files[$$0] = 1; } \
  91.294 -	       END { for (i in files) print i; }'`; \
  91.295 -	test -z "$(ETAGS_ARGS)$$tags$$unique" \
  91.296 -	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  91.297 -	     $$tags $$unique
  91.298 -
  91.299 -ctags: CTAGS
  91.300 -CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  91.301 -		$(TAGS_FILES) $(LISP)
  91.302 -	tags=; \
  91.303 -	here=`pwd`; \
  91.304 -	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  91.305 -	unique=`for i in $$list; do \
  91.306 -	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  91.307 -	  done | \
  91.308 -	  $(AWK) '    { files[$$0] = 1; } \
  91.309 -	       END { for (i in files) print i; }'`; \
  91.310 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  91.311 -	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  91.312 -	     $$tags $$unique
  91.313 -
  91.314 -GTAGS:
  91.315 -	here=`$(am__cd) $(top_builddir) && pwd` \
  91.316 -	  && cd $(top_srcdir) \
  91.317 -	  && gtags -i $(GTAGS_ARGS) $$here
  91.318 -
  91.319 -distclean-tags:
  91.320 -	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  91.321 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  91.322 -
  91.323 -top_distdir = ../..
  91.324 -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
  91.325 -
  91.326 -distdir: $(DISTFILES)
  91.327 -	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
  91.328 -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  91.329 -	list='$(DISTFILES)'; for file in $$list; do \
  91.330 -	  case $$file in \
  91.331 -	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
  91.332 -	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
  91.333 -	  esac; \
  91.334 -	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  91.335 -	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  91.336 -	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  91.337 -	    dir="/$$dir"; \
  91.338 -	    $(mkinstalldirs) "$(distdir)$$dir"; \
  91.339 -	  else \
  91.340 -	    dir=''; \
  91.341 -	  fi; \
  91.342 -	  if test -d $$d/$$file; then \
  91.343 -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  91.344 -	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  91.345 -	    fi; \
  91.346 -	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  91.347 -	  else \
  91.348 -	    test -f $(distdir)/$$file \
  91.349 -	    || cp -p $$d/$$file $(distdir)/$$file \
  91.350 -	    || exit 1; \
  91.351 -	  fi; \
  91.352 -	done
  91.353 -check-am: all-am
  91.354 -check: check-am
  91.355 -all-am: Makefile $(LIBRARIES)
  91.356 -
  91.357 -installdirs:
  91.358 -install: install-am
  91.359 -install-exec: install-exec-am
  91.360 -install-data: install-data-am
  91.361 -uninstall: uninstall-am
  91.362 -
  91.363 -install-am: all-am
  91.364 -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  91.365 -
  91.366 -installcheck: installcheck-am
  91.367 -install-strip:
  91.368 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  91.369 -	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  91.370 -	  `test -z '$(STRIP)' || \
  91.371 -	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  91.372 -mostlyclean-generic:
  91.373 -
  91.374 -clean-generic:
  91.375 -
  91.376 -distclean-generic:
  91.377 -	-rm -f $(CONFIG_CLEAN_FILES)
  91.378 -
  91.379 -maintainer-clean-generic:
  91.380 -	@echo "This command is intended for maintainers to use"
  91.381 -	@echo "it deletes files that may require special tools to rebuild."
  91.382 -clean: clean-am
  91.383 -
  91.384 -clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
  91.385 -
  91.386 -distclean: distclean-am
  91.387 -	-rm -rf ./$(DEPDIR)
  91.388 -	-rm -f Makefile
  91.389 -distclean-am: clean-am distclean-compile distclean-generic \
  91.390 -	distclean-tags
  91.391 -
  91.392 -dvi: dvi-am
  91.393 -
  91.394 -dvi-am:
  91.395 -
  91.396 -info: info-am
  91.397 -
  91.398 -info-am:
  91.399 -
  91.400 -install-data-am:
  91.401 -
  91.402 -install-exec-am:
  91.403 -
  91.404 -install-info: install-info-am
  91.405 -
  91.406 -install-man:
  91.407 -
  91.408 -installcheck-am:
  91.409 -
  91.410 -maintainer-clean: maintainer-clean-am
  91.411 -	-rm -rf ./$(DEPDIR)
  91.412 -	-rm -f Makefile
  91.413 -maintainer-clean-am: distclean-am maintainer-clean-generic
  91.414 -
  91.415 -mostlyclean: mostlyclean-am
  91.416 -
  91.417 -mostlyclean-am: mostlyclean-compile mostlyclean-generic
  91.418 -
  91.419 -pdf: pdf-am
  91.420 -
  91.421 -pdf-am:
  91.422 -
  91.423 -ps: ps-am
  91.424 -
  91.425 -ps-am:
  91.426 -
  91.427 -uninstall-am: uninstall-info-am
  91.428 -
  91.429 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  91.430 -	clean-noinstLIBRARIES ctags distclean distclean-compile \
  91.431 -	distclean-generic distclean-tags distdir dvi dvi-am info \
  91.432 -	info-am install install-am install-data install-data-am \
  91.433 -	install-exec install-exec-am install-info install-info-am \
  91.434 -	install-man install-strip installcheck installcheck-am \
  91.435 -	installdirs maintainer-clean maintainer-clean-generic \
  91.436 -	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
  91.437 -	ps ps-am tags uninstall uninstall-am uninstall-info-am
  91.438 -
  91.439 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
  91.440 -# Otherwise a system limit (for SysV at least) may be exceeded.
  91.441 -.NOEXPORT:

    92.1 --- a/src/sh4/dmac.c	Thu Dec 20 09:56:07 2007 +0000
    92.2 +++ b/src/sh4/dmac.c	Tue Jan 15 20:50:23 2008 +0000
    92.3 @@ -1,5 +1,5 @@
    92.4  /**
    92.5 - * $Id: dmac.c,v 1.4 2007-11-08 11:54:16 nkeynes Exp $
    92.6 + * $Id$
    92.7   * 
    92.8   * SH4 onboard DMA controller (DMAC) peripheral.
    92.9   *

    93.1 --- a/src/sh4/dmac.h	Thu Dec 20 09:56:07 2007 +0000
    93.2 +++ b/src/sh4/dmac.h	Tue Jan 15 20:50:23 2008 +0000
    93.3 @@ -1,5 +1,5 @@
    93.4  /**
    93.5 - * $Id: dmac.h,v 1.2 2007-10-08 12:06:01 nkeynes Exp $
    93.6 + * $Id$
    93.7   *
    93.8   * SH4 onboard DMA controller (DMAC) definitions.
    93.9   *

    94.1 --- a/src/sh4/ia32abi.h	Thu Dec 20 09:56:07 2007 +0000
    94.2 +++ b/src/sh4/ia32abi.h	Tue Jan 15 20:50:23 2008 +0000
    94.3 @@ -1,5 +1,5 @@
    94.4  /**
    94.5 - * $Id: sh4x86.in,v 1.20 2007-11-08 11:54:16 nkeynes Exp $
    94.6 + * $Id$
    94.7   * 
    94.8   * Provides the implementation for the ia32 ABI (eg prologue, epilogue, and
    94.9   * calling conventions)
   94.10 @@ -80,19 +80,16 @@
   94.11  {
   94.12      PUSH_r32(addr);
   94.13      call_func0(sh4_read_long);
   94.14 -    POP_r32(addr);
   94.15 +    POP_r32(R_ECX);
   94.16      PUSH_r32(R_EAX);
   94.17 -    ADD_imm8s_r32( 4, addr );
   94.18 -    PUSH_r32(addr);
   94.19 +    ADD_imm8s_r32( 4, R_ECX );
   94.20 +    PUSH_r32(R_ECX);
   94.21      call_func0(sh4_read_long);
   94.22      ADD_imm8s_r32( 4, R_ESP );
   94.23      MOV_r32_r32( R_EAX, arg2b );
   94.24      POP_r32(arg2a);
   94.25  }
   94.26  
   94.27 -#define EXIT_BLOCK_SIZE 29
   94.28 -
   94.29 -
   94.30  /**
   94.31   * Emit the 'start of block' assembly. Sets up the stack frame and save
   94.32   * SI/DI as required
   94.33 @@ -108,7 +105,9 @@
   94.34      sh4_x86.fpuen_checked = FALSE;
   94.35      sh4_x86.branch_taken = FALSE;
   94.36      sh4_x86.backpatch_posn = 0;
   94.37 +    sh4_x86.recovery_posn = 0;
   94.38      sh4_x86.block_start_pc = pc;
   94.39 +    sh4_x86.tlb_on = IS_MMU_ENABLED();
   94.40      sh4_x86.tstate = TSTATE_NONE;
   94.41  #ifdef STACK_ALIGN
   94.42  	sh4_x86.stack_posn = 8;
   94.43 @@ -119,16 +118,23 @@
   94.44   * Exit the block with sh4r.pc already written
   94.45   * Bytes: 15
   94.46   */
   94.47 -void exit_block_pcset( pc )
   94.48 +void exit_block_pcset( sh4addr_t pc )
   94.49  {
   94.50      load_imm32( R_ECX, ((pc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
   94.51      ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );    // 6
   94.52      load_spreg( R_EAX, REG_OFFSET(pc) );
   94.53 -    call_func1(xlat_get_code,R_EAX);
   94.54 +    if( sh4_x86.tlb_on ) {
   94.55 +	call_func1(xlat_get_code_by_vma,R_EAX);
   94.56 +    } else {
   94.57 +	call_func1(xlat_get_code,R_EAX);
   94.58 +    } 
   94.59      POP_r32(R_EBP);
   94.60      RET();
   94.61  }
   94.62  
   94.63 +#define EXIT_BLOCK_SIZE(pc)  (24 + (IS_IN_ICACHE(pc)?5:CALL_FUNC1_SIZE))
   94.64 +
   94.65 +
   94.66  /**
   94.67   * Exit the block to an absolute PC
   94.68   */
   94.69 @@ -136,7 +142,37 @@
   94.70  {
   94.71      load_imm32( R_ECX, pc );                            // 5
   94.72      store_spreg( R_ECX, REG_OFFSET(pc) );               // 3
   94.73 -    MOV_moff32_EAX( xlat_get_lut_entry(pc) ); // 5
   94.74 +    if( IS_IN_ICACHE(pc) ) {
   94.75 +	MOV_moff32_EAX( xlat_get_lut_entry(GET_ICACHE_PHYS(pc)) ); // 5
   94.76 +    } else if( sh4_x86.tlb_on ) {
   94.77 +	call_func1(xlat_get_code_by_vma,R_ECX);
   94.78 +    } else {
   94.79 +	call_func1(xlat_get_code,R_ECX);
   94.80 +    }
   94.81 +    AND_imm8s_r32( 0xFC, R_EAX ); // 3
   94.82 +    load_imm32( R_ECX, ((endpc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
   94.83 +    ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );     // 6
   94.84 +    POP_r32(R_EBP);
   94.85 +    RET();
   94.86 +}
   94.87 +
   94.88 +#define EXIT_BLOCK_REL_SIZE(pc)  (27 + (IS_IN_ICACHE(pc)?5:CALL_FUNC1_SIZE))
   94.89 +
   94.90 +/**
   94.91 + * Exit the block to a relative PC
   94.92 + */
   94.93 +void exit_block_rel( sh4addr_t pc, sh4addr_t endpc )
   94.94 +{
   94.95 +    load_imm32( R_ECX, pc - sh4_x86.block_start_pc );   // 5
   94.96 +    ADD_sh4r_r32( R_PC, R_ECX );
   94.97 +    store_spreg( R_ECX, REG_OFFSET(pc) );               // 3
   94.98 +    if( IS_IN_ICACHE(pc) ) {
   94.99 +	MOV_moff32_EAX( xlat_get_lut_entry(GET_ICACHE_PHYS(pc)) ); // 5
  94.100 +    } else if( sh4_x86.tlb_on ) {
  94.101 +	call_func1(xlat_get_code_by_vma,R_ECX);
  94.102 +    } else {
  94.103 +	call_func1(xlat_get_code,R_ECX);
  94.104 +    }
  94.105      AND_imm8s_r32( 0xFC, R_EAX ); // 3
  94.106      load_imm32( R_ECX, ((endpc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
  94.107      ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );     // 6
  94.108 @@ -150,48 +186,87 @@
  94.109  void sh4_translate_end_block( sh4addr_t pc ) {
  94.110      if( sh4_x86.branch_taken == FALSE ) {
  94.111  	// Didn't exit unconditionally already, so write the termination here
  94.112 -	exit_block( pc, pc );
  94.113 +	exit_block_rel( pc, pc );
  94.114      }
  94.115      if( sh4_x86.backpatch_posn != 0 ) {
  94.116 +	unsigned int i;
  94.117 +	// Raise exception
  94.118  	uint8_t *end_ptr = xlat_output;
  94.119 -	// Exception termination. Jump block for various exception codes:
  94.120 -	PUSH_imm32( EXC_DATA_ADDR_READ );
  94.121 -	JMP_rel8( 33, target1 );
  94.122 -	PUSH_imm32( EXC_DATA_ADDR_WRITE );
  94.123 -	JMP_rel8( 26, target2 );
  94.124 -	PUSH_imm32( EXC_ILLEGAL );
  94.125 -	JMP_rel8( 19, target3 );
  94.126 -	PUSH_imm32( EXC_SLOT_ILLEGAL ); 
  94.127 -	JMP_rel8( 12, target4 );
  94.128 -	PUSH_imm32( EXC_FPU_DISABLED ); 
  94.129 -	JMP_rel8( 5, target5 );
  94.130 -	PUSH_imm32( EXC_SLOT_FPU_DISABLED );
  94.131 -	// target
  94.132 -	JMP_TARGET(target1);
  94.133 -	JMP_TARGET(target2);
  94.134 -	JMP_TARGET(target3);
  94.135 -	JMP_TARGET(target4);
  94.136 -	JMP_TARGET(target5);
  94.137 -	// Raise exception
  94.138 -	load_spreg( R_ECX, REG_OFFSET(pc) );
  94.139 +	MOV_r32_r32( R_EDX, R_ECX );
  94.140  	ADD_r32_r32( R_EDX, R_ECX );
  94.141 -	ADD_r32_r32( R_EDX, R_ECX );
  94.142 -	store_spreg( R_ECX, REG_OFFSET(pc) );
  94.143 +	ADD_r32_sh4r( R_ECX, R_PC );
  94.144  	MOV_moff32_EAX( &sh4_cpu_period );
  94.145  	MUL_r32( R_EDX );
  94.146  	ADD_r32_sh4r( R_EAX, REG_OFFSET(slice_cycle) );
  94.147  
  94.148  	call_func0( sh4_raise_exception );
  94.149  	ADD_imm8s_r32( 4, R_ESP );
  94.150 -	load_spreg( R_EAX, REG_OFFSET(pc) );
  94.151 -	call_func1(xlat_get_code,R_EAX);
  94.152 +	load_spreg( R_EAX, R_PC );
  94.153 +	if( sh4_x86.tlb_on ) {
  94.154 +	    call_func1(xlat_get_code_by_vma,R_EAX);
  94.155 +	} else {
  94.156 +	    call_func1(xlat_get_code,R_EAX);
  94.157 +	}
  94.158  	POP_r32(R_EBP);
  94.159  	RET();
  94.160  
  94.161 -	sh4_x86_do_backpatch( end_ptr );
  94.162 +	// Exception already raised - just cleanup
  94.163 +	uint8_t *preexc_ptr = xlat_output;
  94.164 +	MOV_r32_r32( R_EDX, R_ECX );
  94.165 +	ADD_r32_r32( R_EDX, R_ECX );
  94.166 +	ADD_r32_sh4r( R_ECX, R_SPC );
  94.167 +	MOV_moff32_EAX( &sh4_cpu_period );
  94.168 +	MUL_r32( R_EDX );
  94.169 +	ADD_r32_sh4r( R_EAX, REG_OFFSET(slice_cycle) );
  94.170 +	load_spreg( R_EAX, R_PC );
  94.171 +	if( sh4_x86.tlb_on ) {
  94.172 +	    call_func1(xlat_get_code_by_vma,R_EAX);
  94.173 +	} else {
  94.174 +	    call_func1(xlat_get_code,R_EAX);
  94.175 +	}
  94.176 +	POP_r32(R_EBP);
  94.177 +	RET();
  94.178 +
  94.179 +	for( i=0; i< sh4_x86.backpatch_posn; i++ ) {
  94.180 +	    *sh4_x86.backpatch_list[i].fixup_addr =
  94.181 +		xlat_output - ((uint8_t *)sh4_x86.backpatch_list[i].fixup_addr) - 4;
  94.182 +	    if( sh4_x86.backpatch_list[i].exc_code == -1 ) {
  94.183 +		load_imm32( R_EDX, sh4_x86.backpatch_list[i].fixup_icount );
  94.184 +		int rel = preexc_ptr - xlat_output;
  94.185 +		JMP_rel(rel);
  94.186 +	    } else {
  94.187 +		PUSH_imm32( sh4_x86.backpatch_list[i].exc_code );
  94.188 +		load_imm32( R_EDX, sh4_x86.backpatch_list[i].fixup_icount );
  94.189 +		int rel = end_ptr - xlat_output;
  94.190 +		JMP_rel(rel);
  94.191 +	    }
  94.192 +	}
  94.193      }
  94.194  }
  94.195  
  94.196 +void *xlat_get_native_pc()
  94.197 +{
  94.198 +    void *result = NULL;
  94.199 +    asm(
  94.200 +	"mov %%ebp, %%eax\n\t"
  94.201 +	"mov $0x8, %%ecx\n\t"
  94.202 +	"mov %1, %%edx\n"
  94.203 +"frame_loop: test %%eax, %%eax\n\t"
  94.204 +	"je frame_not_found\n\t"
  94.205 +	"cmp (%%eax), %%edx\n\t"
  94.206 +	"je frame_found\n\t"
  94.207 +	"sub $0x1, %%ecx\n\t"
  94.208 +	"je frame_not_found\n\t"
  94.209 +	"movl (%%eax), %%eax\n\t"
  94.210 +	"jmp frame_loop\n"
  94.211 +"frame_found: movl 0x4(%%eax), %0\n"
  94.212 +"frame_not_found:"
  94.213 +	: "=r" (result)
  94.214 +	: "r" (&sh4r)
  94.215 +	: "eax", "ecx", "edx" );
  94.216 +    return result;
  94.217 +}
  94.218 +
  94.219  #endif
  94.220  
  94.221  

    95.1 --- a/src/sh4/ia32mac.h	Thu Dec 20 09:56:07 2007 +0000
    95.2 +++ b/src/sh4/ia32mac.h	Tue Jan 15 20:50:23 2008 +0000
    95.3 @@ -1,5 +1,5 @@
    95.4  /**
    95.5 - * $Id: sh4x86.in,v 1.20 2007-11-08 11:54:16 nkeynes Exp $
    95.6 + * $Id$
    95.7   * 
    95.8   * Provides the implementation for the ia32 ABI (eg prologue, epilogue, and
    95.9   * calling conventions)
   95.10 @@ -101,11 +101,11 @@
   95.11      PUSH_r32(addr);
   95.12      load_imm32(R_EAX, (uint32_t)sh4_read_long);
   95.13      CALL_r32(R_EAX);
   95.14 -    POP_r32(addr);
   95.15 +    POP_r32(R_ECX);
   95.16      SUB_imm8s_r32( adj2-adj, R_ESP );
   95.17      PUSH_r32(R_EAX);
   95.18 -    ADD_imm8s_r32( 4, addr );
   95.19 -    PUSH_r32(addr);
   95.20 +    ADD_imm8s_r32( 4, R_ECX );
   95.21 +    PUSH_r32(R_ECX);
   95.22      load_imm32(R_EAX, (uint32_t)sh4_read_long);
   95.23      CALL_r32(R_EAX);
   95.24      ADD_imm8s_r32( 4, R_ESP );
   95.25 @@ -115,9 +115,6 @@
   95.26      sh4_x86.stack_posn -= 4;
   95.27  }
   95.28  
   95.29 -#define EXIT_BLOCK_SIZE 29
   95.30 -
   95.31 -
   95.32  /**
   95.33   * Emit the 'start of block' assembly. Sets up the stack frame and save
   95.34   * SI/DI as required
   95.35 @@ -133,8 +130,10 @@
   95.36      sh4_x86.fpuen_checked = FALSE;
   95.37      sh4_x86.branch_taken = FALSE;
   95.38      sh4_x86.backpatch_posn = 0;
   95.39 +    sh4_x86.recovery_posn = 0;
   95.40      sh4_x86.block_start_pc = pc;
   95.41      sh4_x86.tstate = TSTATE_NONE;
   95.42 +    sh4_x86.tlb_on = IS_MMU_ENABLED();
   95.43      sh4_x86.stack_posn = 8;
   95.44  }
   95.45  
   95.46 @@ -142,16 +141,23 @@
   95.47   * Exit the block with sh4r.pc already written
   95.48   * Bytes: 15
   95.49   */
   95.50 -void exit_block_pcset( pc )
   95.51 +void exit_block_pcset( sh4addr_t pc )
   95.52  {
   95.53      load_imm32( R_ECX, ((pc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
   95.54      ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );    // 6
   95.55      load_spreg( R_EAX, REG_OFFSET(pc) );
   95.56 -    call_func1(xlat_get_code,R_EAX);
   95.57 +    if( sh4_x86.tlb_on ) {
   95.58 +	call_func1(xlat_get_code_by_vma,R_EAX);
   95.59 +    } else {
   95.60 +	call_func1(xlat_get_code,R_EAX);
   95.61 +    }
   95.62      POP_r32(R_EBP);
   95.63      RET();
   95.64  }
   95.65  
   95.66 +#define EXIT_BLOCK_SIZE(pc)  (24 + (IS_IN_ICACHE(pc)?5:CALL_FUNC1_SIZE))
   95.67 +
   95.68 +
   95.69  /**
   95.70   * Exit the block to an absolute PC
   95.71   */
   95.72 @@ -159,7 +165,37 @@
   95.73  {
   95.74      load_imm32( R_ECX, pc );                            // 5
   95.75      store_spreg( R_ECX, REG_OFFSET(pc) );               // 3
   95.76 -    MOV_moff32_EAX( xlat_get_lut_entry(pc) ); // 5
   95.77 +    if( IS_IN_ICACHE(pc) ) {
   95.78 +	MOV_moff32_EAX( xlat_get_lut_entry(GET_ICACHE_PHYS(pc)) ); // 5
   95.79 +    } else if( sh4_x86.tlb_on ) {
   95.80 +	call_func1(xlat_get_code_by_vma,R_ECX);
   95.81 +    } else {
   95.82 +	call_func1(xlat_get_code,R_ECX);
   95.83 +    }
   95.84 +    AND_imm8s_r32( 0xFC, R_EAX ); // 3
   95.85 +    load_imm32( R_ECX, ((endpc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
   95.86 +    ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );     // 6
   95.87 +    POP_r32(R_EBP);
   95.88 +    RET();
   95.89 +}
   95.90 +
   95.91 +#define EXIT_BLOCK_REL_SIZE(pc)  (27 + (IS_IN_ICACHE(pc)?5:CALL_FUNC1_SIZE))
   95.92 +
   95.93 +/**
   95.94 + * Exit the block to a relative PC
   95.95 + */
   95.96 +void exit_block_rel( sh4addr_t pc, sh4addr_t endpc )
   95.97 +{
   95.98 +    load_imm32( R_ECX, pc - sh4_x86.block_start_pc );   // 5
   95.99 +    ADD_sh4r_r32( R_PC, R_ECX );
  95.100 +    store_spreg( R_ECX, REG_OFFSET(pc) );               // 3
  95.101 +    if( IS_IN_ICACHE(pc) ) {
  95.102 +	MOV_moff32_EAX( xlat_get_lut_entry(GET_ICACHE_PHYS(pc)) ); // 5
  95.103 +    } else if( sh4_x86.tlb_on ) {
  95.104 +	call_func1(xlat_get_code_by_vma,R_ECX);
  95.105 +    } else {
  95.106 +	call_func1(xlat_get_code,R_ECX);
  95.107 +    }
  95.108      AND_imm8s_r32( 0xFC, R_EAX ); // 3
  95.109      load_imm32( R_ECX, ((endpc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
  95.110      ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );     // 6
  95.111 @@ -173,48 +209,88 @@
  95.112  void sh4_translate_end_block( sh4addr_t pc ) {
  95.113      if( sh4_x86.branch_taken == FALSE ) {
  95.114  	// Didn't exit unconditionally already, so write the termination here
  95.115 -	exit_block( pc, pc );
  95.116 +	exit_block_rel( pc, pc );
  95.117      }
  95.118      if( sh4_x86.backpatch_posn != 0 ) {
  95.119 +	unsigned int i;
  95.120 +	// Raise exception
  95.121  	uint8_t *end_ptr = xlat_output;
  95.122 -	// Exception termination. Jump block for various exception codes:
  95.123 -	PUSH_imm32( EXC_DATA_ADDR_READ );
  95.124 -	JMP_rel8( 33, target1 );
  95.125 -	PUSH_imm32( EXC_DATA_ADDR_WRITE );
  95.126 -	JMP_rel8( 26, target2 );
  95.127 -	PUSH_imm32( EXC_ILLEGAL );
  95.128 -	JMP_rel8( 19, target3 );
  95.129 -	PUSH_imm32( EXC_SLOT_ILLEGAL ); 
  95.130 -	JMP_rel8( 12, target4 );
  95.131 -	PUSH_imm32( EXC_FPU_DISABLED ); 
  95.132 -	JMP_rel8( 5, target5 );
  95.133 -	PUSH_imm32( EXC_SLOT_FPU_DISABLED );
  95.134 -	// target
  95.135 -	JMP_TARGET(target1);
  95.136 -	JMP_TARGET(target2);
  95.137 -	JMP_TARGET(target3);
  95.138 -	JMP_TARGET(target4);
  95.139 -	JMP_TARGET(target5);
  95.140 -	// Raise exception
  95.141 -	load_spreg( R_ECX, REG_OFFSET(pc) );
  95.142 +	MOV_r32_r32( R_EDX, R_ECX );
  95.143  	ADD_r32_r32( R_EDX, R_ECX );
  95.144 -	ADD_r32_r32( R_EDX, R_ECX );
  95.145 -	store_spreg( R_ECX, REG_OFFSET(pc) );
  95.146 +	ADD_r32_sh4r( R_ECX, R_PC );
  95.147  	MOV_moff32_EAX( &sh4_cpu_period );
  95.148  	MUL_r32( R_EDX );
  95.149  	ADD_r32_sh4r( R_EAX, REG_OFFSET(slice_cycle) );
  95.150  
  95.151 -	POP_r32(R_EDX);
  95.152 -	call_func1( sh4_raise_exception, R_EDX );
  95.153 -	load_spreg( R_EAX, REG_OFFSET(pc) );
  95.154 -	call_func1(xlat_get_code,R_EAX);
  95.155 +        POP_r32(R_EDX);
  95.156 +        call_func1( sh4_raise_exception, R_EDX );
  95.157 +	load_spreg( R_EAX, R_PC );
  95.158 +	if( sh4_x86.tlb_on ) {
  95.159 +	    call_func1(xlat_get_code_by_vma,R_EAX);
  95.160 +	} else {
  95.161 +	    call_func1(xlat_get_code,R_EAX);
  95.162 +	}
  95.163  	POP_r32(R_EBP);
  95.164  	RET();
  95.165  
  95.166 -	sh4_x86_do_backpatch( end_ptr );
  95.167 +	// Exception already raised - just cleanup
  95.168 +	uint8_t *preexc_ptr = xlat_output;
  95.169 +	MOV_r32_r32( R_EDX, R_ECX );
  95.170 +	ADD_r32_r32( R_EDX, R_ECX );
  95.171 +	ADD_r32_sh4r( R_ECX, R_SPC );
  95.172 +	MOV_moff32_EAX( &sh4_cpu_period );
  95.173 +	MUL_r32( R_EDX );
  95.174 +	ADD_r32_sh4r( R_EAX, REG_OFFSET(slice_cycle) );
  95.175 +	load_spreg( R_EAX, R_PC );
  95.176 +	if( sh4_x86.tlb_on ) {
  95.177 +	    call_func1(xlat_get_code_by_vma,R_EAX);
  95.178 +	} else {
  95.179 +	    call_func1(xlat_get_code,R_EAX);
  95.180 +	}
  95.181 +	POP_r32(R_EBP);
  95.182 +	RET();
  95.183 +
  95.184 +	for( i=0; i< sh4_x86.backpatch_posn; i++ ) {
  95.185 +	    *sh4_x86.backpatch_list[i].fixup_addr =
  95.186 +		xlat_output - ((uint8_t *)sh4_x86.backpatch_list[i].fixup_addr) - 4;
  95.187 +	    if( sh4_x86.backpatch_list[i].exc_code == -1 ) {
  95.188 +		load_imm32( R_EDX, sh4_x86.backpatch_list[i].fixup_icount );
  95.189 +		int rel = preexc_ptr - xlat_output;
  95.190 +		JMP_rel(rel);
  95.191 +	    } else {
  95.192 +		PUSH_imm32( sh4_x86.backpatch_list[i].exc_code );
  95.193 +		load_imm32( R_EDX, sh4_x86.backpatch_list[i].fixup_icount );
  95.194 +		int rel = end_ptr - xlat_output;
  95.195 +		JMP_rel(rel);
  95.196 +	    }
  95.197 +	}
  95.198      }
  95.199  }
  95.200  
  95.201 +void *xlat_get_native_pc()
  95.202 +{
  95.203 +    void *result = NULL;
  95.204 +    asm(
  95.205 +	"mov %%ebp, %%eax\n\t"
  95.206 +	"mov $0x8, %%ecx\n\t"
  95.207 +	"mov %1, %%edx\n"
  95.208 +"frame_loop: test %%eax, %%eax\n\t"
  95.209 +	"je frame_not_found\n\t"
  95.210 +	"cmp (%%eax), %%edx\n\t"
  95.211 +	"je frame_found\n\t"
  95.212 +	"sub $0x1, %%ecx\n\t"
  95.213 +	"je frame_not_found\n\t"
  95.214 +	"movl (%%eax), %%eax\n\t"
  95.215 +	"jmp frame_loop\n"
  95.216 +"frame_found: movl 0x4(%%eax), %0\n"
  95.217 +"frame_not_found:"
  95.218 +	: "=r" (result)
  95.219 +	: "r" (&sh4r)
  95.220 +	: "eax", "ecx", "edx" );
  95.221 +    return result;
  95.222 +}
  95.223 +
  95.224 +
  95.225  #endif
  95.226  
  95.227  

    96.1 --- a/src/sh4/ia64abi.h	Thu Dec 20 09:56:07 2007 +0000
    96.2 +++ b/src/sh4/ia64abi.h	Tue Jan 15 20:50:23 2008 +0000
    96.3 @@ -1,5 +1,5 @@
    96.4  /**
    96.5 - * $Id: ia64abi.in,v 1.20 2007-11-08 11:54:16 nkeynes Exp $
    96.6 + * $Id$
    96.7   * 
    96.8   * Provides the implementation for the ia32 ABI (eg prologue, epilogue, and
    96.9   * calling conventions)
   96.10 @@ -20,6 +20,7 @@
   96.11  #ifndef __lxdream_x86_64abi_H
   96.12  #define __lxdream_x86_64abi_H 1
   96.13  
   96.14 +#include <unwind.h>
   96.15  
   96.16  #define load_ptr( reg, ptr ) load_imm64( reg, (uint64_t)ptr );
   96.17      
   96.18 @@ -50,7 +51,7 @@
   96.19      call_func0(ptr);
   96.20  }
   96.21  
   96.22 -#define MEM_WRITE_DOUBLE_SIZE 39
   96.23 +#define MEM_WRITE_DOUBLE_SIZE 35
   96.24  /**
   96.25   * Write a double (64-bit) value into memory, with the first word in arg2a, and
   96.26   * the second in arg2b
   96.27 @@ -60,10 +61,10 @@
   96.28      PUSH_r32(arg2b);
   96.29      PUSH_r32(addr);
   96.30      call_func2(sh4_write_long, addr, arg2a);
   96.31 -    POP_r32(addr);
   96.32 -    POP_r32(arg2b);
   96.33 -    ADD_imm8s_r32(4, addr);
   96.34 -    call_func2(sh4_write_long, addr, arg2b);
   96.35 +    POP_r32(R_EDI);
   96.36 +    POP_r32(R_ESI);
   96.37 +    ADD_imm8s_r32(4, R_EDI);
   96.38 +    call_func0(sh4_write_long);
   96.39  }
   96.40  
   96.41  #define MEM_READ_DOUBLE_SIZE 43
   96.42 @@ -101,7 +102,9 @@
   96.43      sh4_x86.fpuen_checked = FALSE;
   96.44      sh4_x86.branch_taken = FALSE;
   96.45      sh4_x86.backpatch_posn = 0;
   96.46 +    sh4_x86.recovery_posn = 0;
   96.47      sh4_x86.block_start_pc = pc;
   96.48 +    sh4_x86.tlb_on = IS_MMU_ENABLED();
   96.49      sh4_x86.tstate = TSTATE_NONE;
   96.50  }
   96.51  
   96.52 @@ -109,17 +112,21 @@
   96.53   * Exit the block with sh4r.pc already written
   96.54   * Bytes: 15
   96.55   */
   96.56 -void exit_block_pcset( pc )
   96.57 +void exit_block_pcset( sh4addr_t pc )
   96.58  {
   96.59      load_imm32( R_ECX, ((pc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
   96.60      ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );    // 6
   96.61      load_spreg( R_EAX, REG_OFFSET(pc) );
   96.62 -    call_func1(xlat_get_code,R_EAX);
   96.63 +    if( sh4_x86.tlb_on ) {
   96.64 +	call_func1(xlat_get_code_by_vma,R_EAX);
   96.65 +    } else {
   96.66 +	call_func1(xlat_get_code,R_EAX);
   96.67 +    }
   96.68      POP_r32(R_EBP);
   96.69      RET();
   96.70  }
   96.71  
   96.72 -#define EXIT_BLOCK_SIZE 35
   96.73 +#define EXIT_BLOCK_SIZE(pc) (25 + (IS_IN_ICACHE(pc)?10:CALL_FUNC1_SIZE))
   96.74  /**
   96.75   * Exit the block to an absolute PC
   96.76   */
   96.77 @@ -127,8 +134,14 @@
   96.78  {
   96.79      load_imm32( R_ECX, pc );                            // 5
   96.80      store_spreg( R_ECX, REG_OFFSET(pc) );               // 3
   96.81 -    REXW(); MOV_moff32_EAX( xlat_get_lut_entry(pc) );
   96.82 -    REXW(); AND_imm8s_r32( 0xFC, R_EAX ); // 3
   96.83 +    if( IS_IN_ICACHE(pc) ) {
   96.84 +	REXW(); MOV_moff32_EAX( xlat_get_lut_entry(pc) );
   96.85 +    } else if( sh4_x86.tlb_on ) {
   96.86 +	call_func1(xlat_get_code_by_vma, R_ECX);
   96.87 +    } else {
   96.88 +	call_func1(xlat_get_code,R_ECX);
   96.89 +    }
   96.90 +    REXW(); AND_imm8s_r32( 0xFC, R_EAX ); // 4
   96.91      load_imm32( R_ECX, ((endpc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
   96.92      ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );     // 6
   96.93      POP_r32(R_EBP);
   96.94 @@ -136,51 +149,112 @@
   96.95  }
   96.96  
   96.97  
   96.98 +#define EXIT_BLOCK_REL_SIZE(pc)  (28 + (IS_IN_ICACHE(pc)?10:CALL_FUNC1_SIZE))
   96.99 +
  96.100 +/**
  96.101 + * Exit the block to a relative PC
  96.102 + */
  96.103 +void exit_block_rel( sh4addr_t pc, sh4addr_t endpc )
  96.104 +{
  96.105 +    load_imm32( R_ECX, pc - sh4_x86.block_start_pc );   // 5
  96.106 +    ADD_sh4r_r32( R_PC, R_ECX );
  96.107 +    store_spreg( R_ECX, REG_OFFSET(pc) );               // 3
  96.108 +    if( IS_IN_ICACHE(pc) ) {
  96.109 +	REXW(); MOV_moff32_EAX( xlat_get_lut_entry(GET_ICACHE_PHYS(pc)) ); // 5
  96.110 +    } else if( sh4_x86.tlb_on ) {
  96.111 +	call_func1(xlat_get_code_by_vma,R_ECX);
  96.112 +    } else {
  96.113 +	call_func1(xlat_get_code,R_ECX);
  96.114 +    }
  96.115 +    REXW(); AND_imm8s_r32( 0xFC, R_EAX ); // 4
  96.116 +    load_imm32( R_ECX, ((endpc - sh4_x86.block_start_pc)>>1)*sh4_cpu_period ); // 5
  96.117 +    ADD_r32_sh4r( R_ECX, REG_OFFSET(slice_cycle) );     // 6
  96.118 +    POP_r32(R_EBP);
  96.119 +    RET();
  96.120 +}
  96.121 +
  96.122  /**
  96.123   * Write the block trailer (exception handling block)
  96.124   */
  96.125  void sh4_translate_end_block( sh4addr_t pc ) {
  96.126      if( sh4_x86.branch_taken == FALSE ) {
  96.127  	// Didn't exit unconditionally already, so write the termination here
  96.128 -	exit_block( pc, pc );
  96.129 +	exit_block_rel( pc, pc );
  96.130      }
  96.131      if( sh4_x86.backpatch_posn != 0 ) {
  96.132 +	unsigned int i;
  96.133 +	// Raise exception
  96.134  	uint8_t *end_ptr = xlat_output;
  96.135 -	// Exception termination. Jump block for various exception codes:
  96.136 -	load_imm32( R_EDI, EXC_DATA_ADDR_READ );
  96.137 -	JMP_rel8( 33, target1 );
  96.138 -	load_imm32( R_EDI, EXC_DATA_ADDR_WRITE );
  96.139 -	JMP_rel8( 26, target2 );
  96.140 -	load_imm32( R_EDI, EXC_ILLEGAL );
  96.141 -	JMP_rel8( 19, target3 );
  96.142 -	load_imm32( R_EDI, EXC_SLOT_ILLEGAL ); 
  96.143 -	JMP_rel8( 12, target4 );
  96.144 -	load_imm32( R_EDI, EXC_FPU_DISABLED ); 
  96.145 -	JMP_rel8( 5, target5 );
  96.146 -	load_imm32( R_EDI, EXC_SLOT_FPU_DISABLED );
  96.147 -	// target
  96.148 -	JMP_TARGET(target1);
  96.149 -	JMP_TARGET(target2);
  96.150 -	JMP_TARGET(target3);
  96.151 -	JMP_TARGET(target4);
  96.152 -	JMP_TARGET(target5);
  96.153 -	// Raise exception
  96.154 -	load_spreg( R_ECX, REG_OFFSET(pc) );
  96.155 +	MOV_r32_r32( R_EDX, R_ECX );
  96.156  	ADD_r32_r32( R_EDX, R_ECX );
  96.157 -	ADD_r32_r32( R_EDX, R_ECX );
  96.158 -	store_spreg( R_ECX, REG_OFFSET(pc) );
  96.159 +	ADD_r32_sh4r( R_ECX, R_PC );
  96.160  	MOV_moff32_EAX( &sh4_cpu_period );
  96.161  	MUL_r32( R_EDX );
  96.162  	ADD_r32_sh4r( R_EAX, REG_OFFSET(slice_cycle) );
  96.163  
  96.164  	call_func0( sh4_raise_exception );
  96.165 -	load_spreg( R_EAX, REG_OFFSET(pc) );
  96.166 -	call_func1(xlat_get_code,R_EAX);
  96.167 +	load_spreg( R_EAX, R_PC );
  96.168 +	if( sh4_x86.tlb_on ) {
  96.169 +	    call_func1(xlat_get_code_by_vma,R_EAX);
  96.170 +	} else {
  96.171 +	    call_func1(xlat_get_code,R_EAX);
  96.172 +	}
  96.173  	POP_r32(R_EBP);
  96.174  	RET();
  96.175  
  96.176 -	sh4_x86_do_backpatch( end_ptr );
  96.177 +	// Exception already raised - just cleanup
  96.178 +	uint8_t *preexc_ptr = xlat_output;
  96.179 +	MOV_r32_r32( R_EDX, R_ECX );
  96.180 +	ADD_r32_r32( R_EDX, R_ECX );
  96.181 +	ADD_r32_sh4r( R_ECX, R_SPC );
  96.182 +	MOV_moff32_EAX( &sh4_cpu_period );
  96.183 +	MUL_r32( R_EDX );
  96.184 +	ADD_r32_sh4r( R_EAX, REG_OFFSET(slice_cycle) );
  96.185 +	load_spreg( R_EDI, R_PC );
  96.186 +	if( sh4_x86.tlb_on ) {
  96.187 +	    call_func0(xlat_get_code_by_vma);
  96.188 +	} else {
  96.189 +	    call_func0(xlat_get_code);
  96.190 +	}
  96.191 +	POP_r32(R_EBP);
  96.192 +	RET();
  96.193 +
  96.194 +	for( i=0; i< sh4_x86.backpatch_posn; i++ ) {
  96.195 +	    *sh4_x86.backpatch_list[i].fixup_addr =
  96.196 +		xlat_output - ((uint8_t *)sh4_x86.backpatch_list[i].fixup_addr) - 4;
  96.197 +	    if( sh4_x86.backpatch_list[i].exc_code == -1 ) {
  96.198 +		load_imm32( R_EDX, sh4_x86.backpatch_list[i].fixup_icount );
  96.199 +		int rel = preexc_ptr - xlat_output;
  96.200 +		JMP_rel(rel);
  96.201 +	    } else {
  96.202 +		load_imm32( R_EDI, sh4_x86.backpatch_list[i].exc_code );
  96.203 +		load_imm32( R_EDX, sh4_x86.backpatch_list[i].fixup_icount );
  96.204 +		int rel = end_ptr - xlat_output;
  96.205 +		JMP_rel(rel);
  96.206 +	    }
  96.207 +	}
  96.208      }
  96.209  }
  96.210  
  96.211 +_Unwind_Reason_Code xlat_check_frame( struct _Unwind_Context *context, void *arg )
  96.212 +{
  96.213 +    void *rbp = (void *)_Unwind_GetGR(context, 6);
  96.214 +    if( rbp == (void *)&sh4r ) { 
  96.215 +        void **result = (void **)arg;
  96.216 +        *result = (void *)_Unwind_GetIP(context);
  96.217 +        return _URC_NORMAL_STOP;
  96.218 +    }
  96.219 +    
  96.220 +    return _URC_NO_REASON;
  96.221 +}
  96.222 +
  96.223 +void *xlat_get_native_pc()
  96.224 +{
  96.225 +    struct _Unwind_Exception exc;
  96.226 +    
  96.227 +    void *result = NULL;
  96.228 +    _Unwind_Backtrace( xlat_check_frame, &result );
  96.229 +    return result;
  96.230 +}
  96.231 +
  96.232  #endif

    97.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    97.2 +++ b/src/sh4/ia64asm.s	Tue Jan 15 20:50:23 2008 +0000
    97.3 @@ -0,0 +1,34 @@
    97.4 +# 
    97.5 +# Scan back through the stack until we hit the currently executing
    97.6 +# translation block, and find the call return address to that block.
    97.7 +# 
    97.8 +# Implementation: iterate back through each stack frame until we find
    97.9 +# a frame that has a saved %ebp == sh4r (setup by the xlat blocks).
   97.10 +# The return address is then the stack value immediately before the
   97.11 +# saved %ebp.
   97.12 +#
   97.13 +# At most 8 stack frames are checked, to prevent infinite looping on a
   97.14 +# corrupt stack.
   97.15 +
   97.16 +.global xlat_get_native_pc
   97.17 +xlat_get_native_pc:
   97.18 +	mov %rbp, %rax
   97.19 +	mov $0x8, %ecx
   97.20 +	mov $sh4r, %rdx
   97.21 +
   97.22 +frame_loop:
   97.23 +	test %rax, %rax
   97.24 +	je frame_not_found
   97.25 +	cmpq (%rax), %rdx
   97.26 +	je frame_found
   97.27 +	sub $0x1, %ecx
   97.28 +	je frame_not_found
   97.29 +	movq (%rax), %rax
   97.30 +	jmp frame_loop
   97.31 +
   97.32 +frame_found:
   97.33 +	movl 0x4(%rax), %rax
   97.34 +	ret
   97.35 +frame_not_found:
   97.36 +	xor %rax, %rax
   97.37 +	ret

    98.1 --- a/src/sh4/intc.c	Thu Dec 20 09:56:07 2007 +0000
    98.2 +++ b/src/sh4/intc.c	Tue Jan 15 20:50:23 2008 +0000
    98.3 @@ -1,5 +1,5 @@
    98.4  /**
    98.5 - * $Id: intc.c,v 1.8 2007-10-06 08:52:08 nkeynes Exp $
    98.6 + * $Id$
    98.7   *
    98.8   * SH4 onboard interrupt controller (INTC) implementation
    98.9   *

    99.1 --- a/src/sh4/intc.h	Thu Dec 20 09:56:07 2007 +0000
    99.2 +++ b/src/sh4/intc.h	Tue Jan 15 20:50:23 2008 +0000
    99.3 @@ -1,5 +1,5 @@
    99.4  /**
    99.5 - * $Id: intc.h,v 1.2 2005-12-25 08:24:11 nkeynes Exp $
    99.6 + * $Id$
    99.7   *
    99.8   * SH4 onboard interrupt controller (INTC) definitions.
    99.9   *

   100.1 --- a/src/sh4/mmu.c	Thu Dec 20 09:56:07 2007 +0000
   100.2 +++ b/src/sh4/mmu.c	Tue Jan 15 20:50:23 2008 +0000
   100.3 @@ -1,5 +1,5 @@
   100.4  /**
   100.5 - * $Id: mmu.c,v 1.15 2007-11-08 11:54:16 nkeynes Exp $
   100.6 + * $Id$
   100.7   * 
   100.8   * MMU implementation
   100.9   *
  100.10 @@ -22,6 +22,41 @@
  100.11  #include "sh4/sh4core.h"
  100.12  #include "mem.h"
  100.13  
  100.14 +#define VMA_TO_EXT_ADDR(vma) ((vma)&0x1FFFFFFF)
  100.15 +
  100.16 +/* The MMU (practically unique in the system) is allowed to raise exceptions
  100.17 + * directly, with a return code indicating that one was raised and the caller
  100.18 + * had better behave appropriately.
  100.19 + */
  100.20 +#define RAISE_TLB_ERROR(code, vpn) \
  100.21 +    MMIO_WRITE(MMU, TEA, vpn); \
  100.22 +    MMIO_WRITE(MMU, PTEH, ((MMIO_READ(MMU, PTEH) & 0x000003FF) | (vpn&0xFFFFFC00))); \
  100.23 +    sh4_raise_tlb_exception(code);
  100.24 +
  100.25 +#define RAISE_MEM_ERROR(code, vpn) \
  100.26 +    MMIO_WRITE(MMU, TEA, vpn); \
  100.27 +    MMIO_WRITE(MMU, PTEH, ((MMIO_READ(MMU, PTEH) & 0x000003FF) | (vpn&0xFFFFFC00))); \
  100.28 +    sh4_raise_exception(code);
  100.29 +
  100.30 +#define RAISE_OTHER_ERROR(code) \
  100.31 +    sh4_raise_exception(code);
  100.32 +/**
  100.33 + * Abort with a non-MMU address error. Caused by user-mode code attempting
  100.34 + * to access privileged regions, or alignment faults.
  100.35 + */
  100.36 +#define MMU_READ_ADDR_ERROR() RAISE_OTHER_ERROR(EXC_DATA_ADDR_READ)
  100.37 +#define MMU_WRITE_ADDR_ERROR() RAISE_OTHER_ERROR(EXC_DATA_ADDR_WRITE)
  100.38 +
  100.39 +#define MMU_TLB_READ_MISS_ERROR(vpn) RAISE_TLB_ERROR(EXC_TLB_MISS_READ, vpn)
  100.40 +#define MMU_TLB_WRITE_MISS_ERROR(vpn) RAISE_TLB_ERROR(EXC_TLB_MISS_WRITE, vpn)
  100.41 +#define MMU_TLB_INITIAL_WRITE_ERROR(vpn) RAISE_MEM_ERROR(EXC_INIT_PAGE_WRITE, vpn)
  100.42 +#define MMU_TLB_READ_PROT_ERROR(vpn) RAISE_MEM_ERROR(EXC_TLB_PROT_READ, vpn)
  100.43 +#define MMU_TLB_WRITE_PROT_ERROR(vpn) RAISE_MEM_ERROR(EXC_TLB_PROT_WRITE, vpn)
  100.44 +#define MMU_TLB_MULTI_HIT_ERROR(vpn) sh4_raise_reset(EXC_TLB_MULTI_HIT); \
  100.45 +    MMIO_WRITE(MMU, TEA, vpn); \
  100.46 +    MMIO_WRITE(MMU, PTEH, ((MMIO_READ(MMU, PTEH) & 0x000003FF) | (vpn&0xFFFFFC00)));
  100.47 +
  100.48 +
  100.49  #define OCRAM_START (0x1C000000>>PAGE_BITS)
  100.50  #define OCRAM_END   (0x20000000>>PAGE_BITS)
  100.51  
  100.52 @@ -32,6 +67,7 @@
  100.53  #define TLB_VALID     0x00000100
  100.54  #define TLB_USERMODE  0x00000040
  100.55  #define TLB_WRITABLE  0x00000020
  100.56 +#define TLB_USERWRITABLE (TLB_WRITABLE|TLB_USERMODE)
  100.57  #define TLB_SIZE_MASK 0x00000090
  100.58  #define TLB_SIZE_1K   0x00000000
  100.59  #define TLB_SIZE_4K   0x00000010
  100.60 @@ -42,16 +78,22 @@
  100.61  #define TLB_SHARE     0x00000002
  100.62  #define TLB_WRITETHRU 0x00000001
  100.63  
  100.64 +#define MASK_1K  0xFFFFFC00
  100.65 +#define MASK_4K  0xFFFFF000
  100.66 +#define MASK_64K 0xFFFF0000
  100.67 +#define MASK_1M  0xFFF00000
  100.68  
  100.69  struct itlb_entry {
  100.70      sh4addr_t vpn; // Virtual Page Number
  100.71      uint32_t asid; // Process ID
  100.72 +    uint32_t mask;
  100.73      sh4addr_t ppn; // Physical Page Number
  100.74      uint32_t flags;
  100.75  };
  100.76  
  100.77  struct utlb_entry {
  100.78      sh4addr_t vpn; // Virtual Page Number
  100.79 +    uint32_t mask; // Page size mask
  100.80      uint32_t asid; // Process ID
  100.81      sh4addr_t ppn; // Physical Page Number
  100.82      uint32_t flags;
  100.83 @@ -63,12 +105,23 @@
  100.84  static uint32_t mmu_urc;
  100.85  static uint32_t mmu_urb;
  100.86  static uint32_t mmu_lrui;
  100.87 +static uint32_t mmu_asid; // current asid
  100.88  
  100.89  static sh4ptr_t cache = NULL;
  100.90  
  100.91  static void mmu_invalidate_tlb();
  100.92  
  100.93  
  100.94 +static uint32_t get_mask_for_flags( uint32_t flags )
  100.95 +{
  100.96 +    switch( flags & TLB_SIZE_MASK ) {
  100.97 +    case TLB_SIZE_1K: return MASK_1K;
  100.98 +    case TLB_SIZE_4K: return MASK_4K;
  100.99 +    case TLB_SIZE_64K: return MASK_64K;
 100.100 +    case TLB_SIZE_1M: return MASK_1M;
 100.101 +    }
 100.102 +}
 100.103 +
 100.104  int32_t mmio_region_MMU_read( uint32_t reg )
 100.105  {
 100.106      switch( reg ) {
 100.107 @@ -81,9 +134,14 @@
 100.108  
 100.109  void mmio_region_MMU_write( uint32_t reg, uint32_t val )
 100.110  {
 100.111 +    uint32_t tmp;
 100.112      switch(reg) {
 100.113      case PTEH:
 100.114  	val &= 0xFFFFFCFF;
 100.115 +	if( (val & 0xFF) != mmu_asid ) {
 100.116 +	    mmu_asid = val&0xFF;
 100.117 +	    sh4_icache.page_vma = -1; // invalidate icache as asid has changed
 100.118 +	}
 100.119  	break;
 100.120      case PTEL:
 100.121  	val &= 0x1FFFFDFF;
 100.122 @@ -99,6 +157,14 @@
 100.123  	mmu_urb = (val >> 18) & 0x3F;
 100.124  	mmu_lrui = (val >> 26) & 0x3F;
 100.125  	val &= 0x00000301;
 100.126 +	tmp = MMIO_READ( MMU, MMUCR );
 100.127 +	if( ((val ^ tmp) & MMUCR_AT) && sh4_is_using_xlat() ) {
 100.128 +	    // AT flag has changed state - flush the xlt cache as all bets
 100.129 +	    // are off now. We also need to force an immediate exit from the
 100.130 +	    // current block
 100.131 +	    MMIO_WRITE( MMU, MMUCR, val );
 100.132 +	    sh4_translate_flush_cache();
 100.133 +	}
 100.134  	break;
 100.135      case CCR:
 100.136  	mmu_set_cache_mode( val & (CCR_OIX|CCR_ORA) );
 100.137 @@ -118,6 +184,7 @@
 100.138  void MMU_reset()
 100.139  {
 100.140      mmio_region_MMU_write( CCR, 0 );
 100.141 +    mmio_region_MMU_write( MMUCR, 0 );
 100.142  }
 100.143  
 100.144  void MMU_save_state( FILE *f )
 100.145 @@ -125,6 +192,10 @@
 100.146      fwrite( cache, 4096, 2, f );
 100.147      fwrite( &mmu_itlb, sizeof(mmu_itlb), 1, f );
 100.148      fwrite( &mmu_utlb, sizeof(mmu_utlb), 1, f );
 100.149 +    fwrite( &mmu_urc, sizeof(mmu_urc), 1, f );
 100.150 +    fwrite( &mmu_urb, sizeof(mmu_urb), 1, f );
 100.151 +    fwrite( &mmu_lrui, sizeof(mmu_lrui), 1, f );
 100.152 +    fwrite( &mmu_asid, sizeof(mmu_asid), 1, f );
 100.153  }
 100.154  
 100.155  int MMU_load_state( FILE *f )
 100.156 @@ -142,6 +213,18 @@
 100.157      if( fread( &mmu_utlb, sizeof(mmu_utlb), 1, f ) != 1 ) {
 100.158  	return 1;
 100.159      }
 100.160 +    if( fread( &mmu_urc, sizeof(mmu_urc), 1, f ) != 1 ) {
 100.161 +	return 1;
 100.162 +    }
 100.163 +    if( fread( &mmu_urc, sizeof(mmu_urb), 1, f ) != 1 ) {
 100.164 +	return 1;
 100.165 +    }
 100.166 +    if( fread( &mmu_lrui, sizeof(mmu_lrui), 1, f ) != 1 ) {
 100.167 +	return 1;
 100.168 +    }
 100.169 +    if( fread( &mmu_asid, sizeof(mmu_asid), 1, f ) != 1 ) {
 100.170 +    	return 1;
 100.171 +    }
 100.172      return 0;
 100.173  }
 100.174  
 100.175 @@ -177,41 +260,7 @@
 100.176      mmu_utlb[mmu_urc].ppn = MMIO_READ(MMU, PTEL) & 0x1FFFFC00;
 100.177      mmu_utlb[mmu_urc].flags = MMIO_READ(MMU, PTEL) & 0x00001FF;
 100.178      mmu_utlb[mmu_urc].pcmcia = MMIO_READ(MMU, PTEA);
 100.179 -}
 100.180 -
 100.181 -uint64_t mmu_translate_read( sh4addr_t addr )
 100.182 -{
 100.183 -    uint32_t mmucr = MMIO_READ(MMU,MMUCR);
 100.184 -    if( IS_SH4_PRIVMODE() ) {
 100.185 -	switch( addr & 0xE0000000 ) {
 100.186 -	case 0x80000000: case 0xA0000000:
 100.187 -	    /* Non-translated read P1,P2 */
 100.188 -	    break;
 100.189 -	case 0xE0000000:
 100.190 -	    /* Non-translated read P4 */
 100.191 -	    break;
 100.192 -	default:
 100.193 -	    if( mmucr&MMUCR_AT ) {
 100.194 -	    } else {
 100.195 -		// direct read
 100.196 -	    }
 100.197 -	}
 100.198 -    } else {
 100.199 -	if( addr & 0x80000000 ) {
 100.200 -	    if( ((addr&0xFC000000) == 0xE0000000 ) &&
 100.201 -		((mmucr&MMUCR_SQMD) == 0) ) { 
 100.202 -		// Store queue
 100.203 -		return 0;
 100.204 -	    }
 100.205 -//	    MMU_READ_ADDR_ERROR();
 100.206 -	}
 100.207 -	if( mmucr&MMUCR_AT ) {
 100.208 -	    uint32_t vpn = addr & 0xFFFFFC00;
 100.209 -	    uint32_t asid = MMIO_READ(MMU,PTEH)&0xFF;
 100.210 -	} else {
 100.211 -	    // direct read
 100.212 -	}
 100.213 -    }
 100.214 +    mmu_utlb[mmu_urc].mask = get_mask_for_flags(mmu_utlb[mmu_urc].flags);
 100.215  }
 100.216  
 100.217  static void mmu_invalidate_tlb()
 100.218 @@ -251,6 +300,7 @@
 100.219      struct itlb_entry *ent = &mmu_itlb[ITLB_ENTRY(addr)];
 100.220      ent->ppn = val & 0x1FFFFC00;
 100.221      ent->flags = val & 0x00001DA;
 100.222 +    ent->mask = get_mask_for_flags(val);
 100.223  }
 100.224  
 100.225  #define UTLB_ENTRY(addr) ((addr>>8)&0x3F)
 100.226 @@ -273,9 +323,70 @@
 100.227      }
 100.228  }
 100.229  
 100.230 +/**
 100.231 + * Find a UTLB entry for the associative TLB write - same as the normal
 100.232 + * lookup but ignores the valid bit.
 100.233 + */
 100.234 +static inline mmu_utlb_lookup_assoc( uint32_t vpn, uint32_t asid )
 100.235 +{
 100.236 +    int result = -1;
 100.237 +    unsigned int i;
 100.238 +    for( i = 0; i < UTLB_ENTRY_COUNT; i++ ) {
 100.239 +	if( (mmu_utlb[i].flags & TLB_VALID) &&
 100.240 +	    ((mmu_utlb[i].flags & TLB_SHARE) || asid == mmu_utlb[i].asid) && 
 100.241 +	    ((mmu_utlb[i].vpn ^ vpn) & mmu_utlb[i].mask) == 0 ) {
 100.242 +	    if( result != -1 ) {
 100.243 +		fprintf( stderr, "TLB Multi hit: %d %d\n", result, i );
 100.244 +		return -2;
 100.245 +	    }
 100.246 +	    result = i;
 100.247 +	}
 100.248 +    }
 100.249 +    return result;
 100.250 +}
 100.251 +
 100.252 +/**
 100.253 + * Find a ITLB entry for the associative TLB write - same as the normal
 100.254 + * lookup but ignores the valid bit.
 100.255 + */
 100.256 +static inline mmu_itlb_lookup_assoc( uint32_t vpn, uint32_t asid )
 100.257 +{
 100.258 +    int result = -1;
 100.259 +    unsigned int i;
 100.260 +    for( i = 0; i < ITLB_ENTRY_COUNT; i++ ) {
 100.261 +	if( (mmu_itlb[i].flags & TLB_VALID) &&
 100.262 +	    ((mmu_itlb[i].flags & TLB_SHARE) || asid == mmu_itlb[i].asid) && 
 100.263 +	    ((mmu_itlb[i].vpn ^ vpn) & mmu_itlb[i].mask) == 0 ) {
 100.264 +	    if( result != -1 ) {
 100.265 +		return -2;
 100.266 +	    }
 100.267 +	    result = i;
 100.268 +	}
 100.269 +    }
 100.270 +    return result;
 100.271 +}
 100.272 +
 100.273  void mmu_utlb_addr_write( sh4addr_t addr, uint32_t val )
 100.274  {
 100.275      if( UTLB_ASSOC(addr) ) {
 100.276 +	int utlb = mmu_utlb_lookup_assoc( val, mmu_asid );
 100.277 +	if( utlb >= 0 ) {
 100.278 +	    struct utlb_entry *ent = &mmu_utlb[utlb];
 100.279 +	    ent->flags = ent->flags & ~(TLB_DIRTY|TLB_VALID);
 100.280 +	    ent->flags |= (val & TLB_VALID);
 100.281 +	    ent->flags |= ((val & 0x200)>>7);
 100.282 +	}
 100.283 +
 100.284 +	int itlb = mmu_itlb_lookup_assoc( val, mmu_asid );
 100.285 +	if( itlb >= 0 ) {
 100.286 +	    struct itlb_entry *ent = &mmu_itlb[itlb];
 100.287 +	    ent->flags = (ent->flags & (~TLB_VALID)) | (val & TLB_VALID);
 100.288 +	}
 100.289 +
 100.290 +	if( itlb == -2 || utlb == -2 ) {
 100.291 +	    MMU_TLB_MULTI_HIT_ERROR(addr);
 100.292 +	    return;
 100.293 +	}
 100.294      } else {
 100.295  	struct utlb_entry *ent = &mmu_utlb[UTLB_ENTRY(addr)];
 100.296  	ent->vpn = (val & 0xFFFFFC00);
 100.297 @@ -294,6 +405,7 @@
 100.298      } else {
 100.299  	ent->ppn = (val & 0x1FFFFC00);
 100.300  	ent->flags = (val & 0x000001FF);
 100.301 +	ent->mask = get_mask_for_flags(val);
 100.302      }
 100.303  }
 100.304  
 100.305 @@ -331,3 +443,455 @@
 100.306  void mmu_ocache_data_write( sh4addr_t addr, uint32_t val )
 100.307  {
 100.308  }
 100.309 +
 100.310 +/******************************************************************************/
 100.311 +/*                        MMU TLB address translation                         */
 100.312 +/******************************************************************************/
 100.313 +
 100.314 +/**
 100.315 + * The translations are excessively complicated, but unfortunately it's a 
 100.316 + * complicated system. TODO: make this not be painfully slow.
 100.317 + */
 100.318 +
 100.319 +/**
 100.320 + * Perform the actual utlb lookup w/ asid matching.
 100.321 + * Possible utcomes are:
 100.322 + *   0..63 Single match - good, return entry found
 100.323 + *   -1 No match - raise a tlb data miss exception
 100.324 + *   -2 Multiple matches - raise a multi-hit exception (reset)
 100.325 + * @param vpn virtual address to resolve
 100.326 + * @return the resultant UTLB entry, or an error.
 100.327 + */
 100.328 +static inline int mmu_utlb_lookup_vpn_asid( uint32_t vpn )
 100.329 +{
 100.330 +    int result = -1;
 100.331 +    unsigned int i;
 100.332 +
 100.333 +    mmu_urc++;
 100.334 +    if( mmu_urc == mmu_urb || mmu_urc == 0x40 ) {
 100.335 +	mmu_urc = 0;
 100.336 +    }
 100.337 +
 100.338 +    for( i = 0; i < UTLB_ENTRY_COUNT; i++ ) {
 100.339 +	if( (mmu_utlb[i].flags & TLB_VALID) &&
 100.340 +	    ((mmu_utlb[i].flags & TLB_SHARE) || mmu_asid == mmu_utlb[i].asid) && 
 100.341 +	    ((mmu_utlb[i].vpn ^ vpn) & mmu_utlb[i].mask) == 0 ) {
 100.342 +	    if( result != -1 ) {
 100.343 +		return -2;
 100.344 +	    }
 100.345 +	    result = i;
 100.346 +	}
 100.347 +    }
 100.348 +    return result;
 100.349 +}
 100.350 +
 100.351 +/**
 100.352 + * Perform the actual utlb lookup matching on vpn only
 100.353 + * Possible utcomes are:
 100.354 + *   0..63 Single match - good, return entry found
 100.355 + *   -1 No match - raise a tlb data miss exception
 100.356 + *   -2 Multiple matches - raise a multi-hit exception (reset)
 100.357 + * @param vpn virtual address to resolve
 100.358 + * @return the resultant UTLB entry, or an error.
 100.359 + */
 100.360 +static inline int mmu_utlb_lookup_vpn( uint32_t vpn )
 100.361 +{
 100.362 +    int result = -1;
 100.363 +    unsigned int i;
 100.364 +
 100.365 +    mmu_urc++;
 100.366 +    if( mmu_urc == mmu_urb || mmu_urc == 0x40 ) {
 100.367 +	mmu_urc = 0;
 100.368 +    }
 100.369 +
 100.370 +    for( i = 0; i < UTLB_ENTRY_COUNT; i++ ) {
 100.371 +	if( (mmu_utlb[i].flags & TLB_VALID) &&
 100.372 +	    ((mmu_utlb[i].vpn ^ vpn) & mmu_utlb[i].mask) == 0 ) {
 100.373 +	    if( result != -1 ) {
 100.374 +		return -2;
 100.375 +	    }
 100.376 +	    result = i;
 100.377 +	}
 100.378 +    }
 100.379 +
 100.380 +    return result;
 100.381 +}
 100.382 +
 100.383 +/**
 100.384 + * Update the ITLB by replacing the LRU entry with the specified UTLB entry.
 100.385 + * @return the number (0-3) of the replaced entry.
 100.386 + */
 100.387 +static int inline mmu_itlb_update_from_utlb( int entryNo )
 100.388 +{
 100.389 +    int replace;
 100.390 +    /* Determine entry to replace based on lrui */
 100.391 +    if( (mmu_lrui & 0x38) == 0x38 ) {
 100.392 +	replace = 0;
 100.393 +	mmu_lrui = mmu_lrui & 0x07;
 100.394 +    } else if( (mmu_lrui & 0x26) == 0x06 ) {
 100.395 +	replace = 1;
 100.396 +	mmu_lrui = (mmu_lrui & 0x19) | 0x20;
 100.397 +    } else if( (mmu_lrui & 0x15) == 0x01 ) {
 100.398 +	replace = 2;
 100.399 +	mmu_lrui = (mmu_lrui & 0x3E) | 0x14;
 100.400 +    } else { // Note - gets invalid entries too
 100.401 +	replace = 3;
 100.402 +	mmu_lrui = (mmu_lrui | 0x0B);
 100.403 +    } 
 100.404 +
 100.405 +    mmu_itlb[replace].vpn = mmu_utlb[entryNo].vpn;
 100.406 +    mmu_itlb[replace].mask = mmu_utlb[entryNo].mask;
 100.407 +    mmu_itlb[replace].ppn = mmu_utlb[entryNo].ppn;
 100.408 +    mmu_itlb[replace].asid = mmu_utlb[entryNo].asid;
 100.409 +    mmu_itlb[replace].flags = mmu_utlb[entryNo].flags & 0x01DA;
 100.410 +    return replace;
 100.411 +}
 100.412 +
 100.413 +/**
 100.414 + * Perform the actual itlb lookup w/ asid protection
 100.415 + * Possible utcomes are:
 100.416 + *   0..63 Single match - good, return entry found
 100.417 + *   -1 No match - raise a tlb data miss exception
 100.418 + *   -2 Multiple matches - raise a multi-hit exception (reset)
 100.419 + * @param vpn virtual address to resolve
 100.420 + * @return the resultant ITLB entry, or an error.
 100.421 + */
 100.422 +static inline int mmu_itlb_lookup_vpn_asid( uint32_t vpn )
 100.423 +{
 100.424 +    int result = -1;
 100.425 +    unsigned int i;
 100.426 +
 100.427 +    for( i = 0; i < ITLB_ENTRY_COUNT; i++ ) {
 100.428 +	if( (mmu_itlb[i].flags & TLB_VALID) &&
 100.429 +	    ((mmu_itlb[i].flags & TLB_SHARE) || mmu_asid == mmu_itlb[i].asid) && 
 100.430 +	    ((mmu_itlb[i].vpn ^ vpn) & mmu_itlb[i].mask) == 0 ) {
 100.431 +	    if( result != -1 ) {
 100.432 +		return -2;
 100.433 +	    }
 100.434 +	    result = i;
 100.435 +	}
 100.436 +    }
 100.437 +
 100.438 +    if( result == -1 ) {
 100.439 +	int utlbEntry = mmu_utlb_lookup_vpn_asid( vpn );
 100.440 +	if( utlbEntry < 0 ) {
 100.441 +	    return utlbEntry;
 100.442 +	} else {
 100.443 +	    return mmu_itlb_update_from_utlb( utlbEntry );
 100.444 +	}
 100.445 +    }
 100.446 +
 100.447 +    switch( result ) {
 100.448 +    case 0: mmu_lrui = (mmu_lrui & 0x07); break;
 100.449 +    case 1: mmu_lrui = (mmu_lrui & 0x19) | 0x20; break;
 100.450 +    case 2: mmu_lrui = (mmu_lrui & 0x3E) | 0x14; break;
 100.451 +    case 3: mmu_lrui = (mmu_lrui | 0x0B); break;
 100.452 +    }
 100.453 +	
 100.454 +    return result;
 100.455 +}
 100.456 +
 100.457 +/**
 100.458 + * Perform the actual itlb lookup on vpn only
 100.459 + * Possible utcomes are:
 100.460 + *   0..63 Single match - good, return entry found
 100.461 + *   -1 No match - raise a tlb data miss exception
 100.462 + *   -2 Multiple matches - raise a multi-hit exception (reset)
 100.463 + * @param vpn virtual address to resolve
 100.464 + * @return the resultant ITLB entry, or an error.
 100.465 + */
 100.466 +static inline int mmu_itlb_lookup_vpn( uint32_t vpn )
 100.467 +{
 100.468 +    int result = -1;
 100.469 +    unsigned int i;
 100.470 +
 100.471 +    for( i = 0; i < ITLB_ENTRY_COUNT; i++ ) {
 100.472 +	if( (mmu_itlb[i].flags & TLB_VALID) &&
 100.473 +	    ((mmu_itlb[i].vpn ^ vpn) & mmu_itlb[i].mask) == 0 ) {
 100.474 +	    if( result != -1 ) {
 100.475 +		return -2;
 100.476 +	    }
 100.477 +	    result = i;
 100.478 +	}
 100.479 +    }
 100.480 +
 100.481 +    if( result == -1 ) {
 100.482 +	int utlbEntry = mmu_utlb_lookup_vpn( vpn );
 100.483 +	if( utlbEntry < 0 ) {
 100.484 +	    return utlbEntry;
 100.485 +	} else {
 100.486 +	    return mmu_itlb_update_from_utlb( utlbEntry );
 100.487 +	}
 100.488 +    }
 100.489 +
 100.490 +    switch( result ) {
 100.491 +    case 0: mmu_lrui = (mmu_lrui & 0x07); break;
 100.492 +    case 1: mmu_lrui = (mmu_lrui & 0x19) | 0x20; break;
 100.493 +    case 2: mmu_lrui = (mmu_lrui & 0x3E) | 0x14; break;
 100.494 +    case 3: mmu_lrui = (mmu_lrui | 0x0B); break;
 100.495 +    }
 100.496 +	
 100.497 +    return result;
 100.498 +}
 100.499 +
 100.500 +sh4addr_t mmu_vma_to_phys_read( sh4vma_t addr )
 100.501 +{
 100.502 +    uint32_t mmucr = MMIO_READ(MMU,MMUCR);
 100.503 +    if( addr & 0x80000000 ) {
 100.504 +	if( IS_SH4_PRIVMODE() ) {
 100.505 +	    if( addr >= 0xE0000000 ) {
 100.506 +		return addr; /* P4 - passthrough */
 100.507 +	    } else if( addr < 0xC0000000 ) {
 100.508 +		/* P1, P2 regions are pass-through (no translation) */
 100.509 +		return VMA_TO_EXT_ADDR(addr);
 100.510 +	    }
 100.511 +	} else {
 100.512 +	    if( addr >= 0xE0000000 && addr < 0xE4000000 &&
 100.513 +		((mmucr&MMUCR_SQMD) == 0) ) {
 100.514 +		/* Conditional user-mode access to the store-queue (no translation) */
 100.515 +		return addr;
 100.516 +	    }
 100.517 +	    MMU_READ_ADDR_ERROR();
 100.518 +	    return MMU_VMA_ERROR;
 100.519 +	}
 100.520 +    }
 100.521 +    
 100.522 +    if( (mmucr & MMUCR_AT) == 0 ) {
 100.523 +	return VMA_TO_EXT_ADDR(addr);
 100.524 +    }
 100.525 +
 100.526 +    /* If we get this far, translation is required */
 100.527 +    int entryNo;
 100.528 +    if( ((mmucr & MMUCR_SV) == 0) || !IS_SH4_PRIVMODE() ) {
 100.529 +	entryNo = mmu_utlb_lookup_vpn_asid( addr );
 100.530 +    } else {
 100.531 +	entryNo = mmu_utlb_lookup_vpn( addr );
 100.532 +    }
 100.533 +
 100.534 +    switch(entryNo) {
 100.535 +    case -1:
 100.536 +	MMU_TLB_READ_MISS_ERROR(addr);
 100.537 +	return MMU_VMA_ERROR;
 100.538 +    case -2:
 100.539 +	MMU_TLB_MULTI_HIT_ERROR(addr);
 100.540 +	return MMU_VMA_ERROR;
 100.541 +    default:
 100.542 +	if( (mmu_utlb[entryNo].flags & TLB_USERMODE) == 0 &&
 100.543 +	    !IS_SH4_PRIVMODE() ) {
 100.544 +	    /* protection violation */
 100.545 +	    MMU_TLB_READ_PROT_ERROR(addr);
 100.546 +	    return MMU_VMA_ERROR;
 100.547 +	}
 100.548 +
 100.549 +	/* finally generate the target address */
 100.550 +	return (mmu_utlb[entryNo].ppn & mmu_utlb[entryNo].mask) | 
 100.551 +	    (addr & (~mmu_utlb[entryNo].mask));
 100.552 +    }
 100.553 +}
 100.554 +
 100.555 +sh4addr_t mmu_vma_to_phys_write( sh4vma_t addr )
 100.556 +{
 100.557 +    uint32_t mmucr = MMIO_READ(MMU,MMUCR);
 100.558 +    if( addr & 0x80000000 ) {
 100.559 +	if( IS_SH4_PRIVMODE() ) {
 100.560 +	    if( addr >= 0xE0000000 ) {
 100.561 +		return addr; /* P4 - passthrough */
 100.562 +	    } else if( addr < 0xC0000000 ) {
 100.563 +		/* P1, P2 regions are pass-through (no translation) */
 100.564 +		return VMA_TO_EXT_ADDR(addr);
 100.565 +	    }
 100.566 +	} else {
 100.567 +	    if( addr >= 0xE0000000 && addr < 0xE4000000 &&
 100.568 +		((mmucr&MMUCR_SQMD) == 0) ) {
 100.569 +		/* Conditional user-mode access to the store-queue (no translation) */
 100.570 +		return addr;
 100.571 +	    }
 100.572 +	    MMU_WRITE_ADDR_ERROR();
 100.573 +	    return MMU_VMA_ERROR;
 100.574 +	}
 100.575 +    }
 100.576 +    
 100.577 +    if( (mmucr & MMUCR_AT) == 0 ) {
 100.578 +	return VMA_TO_EXT_ADDR(addr);
 100.579 +    }
 100.580 +
 100.581 +    /* If we get this far, translation is required */
 100.582 +    int entryNo;
 100.583 +    if( ((mmucr & MMUCR_SV) == 0) || !IS_SH4_PRIVMODE() ) {
 100.584 +	entryNo = mmu_utlb_lookup_vpn_asid( addr );
 100.585 +    } else {
 100.586 +	entryNo = mmu_utlb_lookup_vpn( addr );
 100.587 +    }
 100.588 +
 100.589 +    switch(entryNo) {
 100.590 +    case -1:
 100.591 +	MMU_TLB_WRITE_MISS_ERROR(addr);
 100.592 +	return MMU_VMA_ERROR;
 100.593 +    case -2:
 100.594 +	MMU_TLB_MULTI_HIT_ERROR(addr);
 100.595 +	return MMU_VMA_ERROR;
 100.596 +    default:
 100.597 +	if( IS_SH4_PRIVMODE() ? ((mmu_utlb[entryNo].flags & TLB_WRITABLE) == 0)
 100.598 +	    : ((mmu_utlb[entryNo].flags & TLB_USERWRITABLE) != TLB_USERWRITABLE) ) {
 100.599 +	    /* protection violation */
 100.600 +	    MMU_TLB_WRITE_PROT_ERROR(addr);
 100.601 +	    return MMU_VMA_ERROR;
 100.602 +	}
 100.603 +
 100.604 +	if( (mmu_utlb[entryNo].flags & TLB_DIRTY) == 0 ) {
 100.605 +	    MMU_TLB_INITIAL_WRITE_ERROR(addr);
 100.606 +	    return MMU_VMA_ERROR;
 100.607 +	}
 100.608 +
 100.609 +	/* finally generate the target address */
 100.610 +	return (mmu_utlb[entryNo].ppn & mmu_utlb[entryNo].mask) | 
 100.611 +	    (addr & (~mmu_utlb[entryNo].mask));
 100.612 +    }
 100.613 +}
 100.614 +
 100.615 +/**
 100.616 + * Update the icache for an untranslated address
 100.617 + */
 100.618 +void mmu_update_icache_phys( sh4addr_t addr )
 100.619 +{
 100.620 +    if( (addr & 0x1C000000) == 0x0C000000 ) {
 100.621 +	/* Main ram */
 100.622 +	sh4_icache.page_vma = addr & 0xFF000000;
 100.623 +	sh4_icache.page_ppa = 0x0C000000;
 100.624 +	sh4_icache.mask = 0xFF000000;
 100.625 +	sh4_icache.page = sh4_main_ram;
 100.626 +    } else if( (addr & 0x1FE00000) == 0 ) {
 100.627 +	/* BIOS ROM */
 100.628 +	sh4_icache.page_vma = addr & 0xFFE00000;
 100.629 +	sh4_icache.page_ppa = 0;
 100.630 +	sh4_icache.mask = 0xFFE00000;
 100.631 +	sh4_icache.page = mem_get_region(0);
 100.632 +    } else {
 100.633 +	/* not supported */
 100.634 +	sh4_icache.page_vma = -1;
 100.635 +    }
 100.636 +}
 100.637 +
 100.638 +/**
 100.639 + * Update the sh4_icache structure to describe the page(s) containing the
 100.640 + * given vma. If the address does not reference a RAM/ROM region, the icache
 100.641 + * will be invalidated instead.
 100.642 + * If AT is on, this method will raise TLB exceptions normally
 100.643 + * (hence this method should only be used immediately prior to execution of
 100.644 + * code), and otherwise will set the icache according to the matching TLB entry.
 100.645 + * If AT is off, this method will set the entire referenced RAM/ROM region in
 100.646 + * the icache.
 100.647 + * @return TRUE if the update completed (successfully or otherwise), FALSE
 100.648 + * if an exception was raised.
 100.649 + */
 100.650 +gboolean mmu_update_icache( sh4vma_t addr )
 100.651 +{
 100.652 +    int entryNo;
 100.653 +    if( IS_SH4_PRIVMODE()  ) {
 100.654 +	if( addr & 0x80000000 ) {
 100.655 +	    if( addr < 0xC0000000 ) {
 100.656 +		/* P1, P2 and P4 regions are pass-through (no translation) */
 100.657 +		mmu_update_icache_phys(addr);
 100.658 +		return TRUE;
 100.659 +	    } else if( addr >= 0xE0000000 && addr < 0xFFFFFF00 ) {
 100.660 +		MMU_READ_ADDR_ERROR();
 100.661 +		return FALSE;
 100.662 +	    }
 100.663 +	}
 100.664 +    
 100.665 +	uint32_t mmucr = MMIO_READ(MMU,MMUCR);
 100.666 +	if( (mmucr & MMUCR_AT) == 0 ) {
 100.667 +	    mmu_update_icache_phys(addr);
 100.668 +	    return TRUE;
 100.669 +	}
 100.670 +
 100.671 +	entryNo = mmu_itlb_lookup_vpn( addr );
 100.672 +    } else {
 100.673 +	if( addr & 0x80000000 ) {
 100.674 +	    MMU_READ_ADDR_ERROR();
 100.675 +	    return FALSE;
 100.676 +	}
 100.677 +
 100.678 +	uint32_t mmucr = MMIO_READ(MMU,MMUCR);
 100.679 +	if( (mmucr & MMUCR_AT) == 0 ) {
 100.680 +	    mmu_update_icache_phys(addr);
 100.681 +	    return TRUE;
 100.682 +	}
 100.683 +	
 100.684 +	if( mmucr & MMUCR_SV ) {
 100.685 +	    entryNo = mmu_itlb_lookup_vpn( addr );
 100.686 +	} else {
 100.687 +	    entryNo = mmu_itlb_lookup_vpn_asid( addr );
 100.688 +	}
 100.689 +	if( entryNo != -1 && (mmu_itlb[entryNo].flags & TLB_USERMODE) == 0 ) {
 100.690 +	    MMU_TLB_READ_PROT_ERROR(addr);
 100.691 +	    return FALSE;
 100.692 +	}
 100.693 +    }
 100.694 +
 100.695 +    switch(entryNo) {
 100.696 +    case -1:
 100.697 +	MMU_TLB_READ_MISS_ERROR(addr);
 100.698 +	return FALSE;
 100.699 +    case -2:
 100.700 +	MMU_TLB_MULTI_HIT_ERROR(addr);
 100.701 +	return FALSE;
 100.702 +    default:
 100.703 +	sh4_icache.page_ppa = mmu_itlb[entryNo].ppn & mmu_itlb[entryNo].mask;
 100.704 +	sh4_icache.page = mem_get_region( sh4_icache.page_ppa );
 100.705 +	if( sh4_icache.page == NULL ) {
 100.706 +	    sh4_icache.page_vma = -1;
 100.707 +	} else {
 100.708 +	    sh4_icache.page_vma = mmu_itlb[entryNo].vpn & mmu_itlb[entryNo].mask;
 100.709 +	    sh4_icache.mask = mmu_itlb[entryNo].mask;
 100.710 +	}
 100.711 +	return TRUE;
 100.712 +    }
 100.713 +}
 100.714 +
 100.715 +gboolean sh4_flush_store_queue( sh4addr_t addr )
 100.716 +{
 100.717 +    uint32_t mmucr = MMIO_READ(MMU,MMUCR);
 100.718 +    int queue = (addr&0x20)>>2;
 100.719 +    sh4ptr_t src = (sh4ptr_t)&sh4r.store_queue[queue];
 100.720 +    sh4addr_t target;
 100.721 +    /* Store queue operation */
 100.722 +    if( mmucr & MMUCR_AT ) {
 100.723 +	int entryNo;
 100.724 +	if( ((mmucr & MMUCR_SV) == 0) || !IS_SH4_PRIVMODE() ) {
 100.725 +	    entryNo = mmu_utlb_lookup_vpn_asid( addr );
 100.726 +	} else {
 100.727 +	    entryNo = mmu_utlb_lookup_vpn( addr );
 100.728 +	}
 100.729 +	switch(entryNo) {
 100.730 +	case -1:
 100.731 +	    MMU_TLB_WRITE_MISS_ERROR(addr);
 100.732 +	    return FALSE;
 100.733 +	case -2:
 100.734 +	    MMU_TLB_MULTI_HIT_ERROR(addr);
 100.735 +	    return FALSE;
 100.736 +	default:
 100.737 +	    if( IS_SH4_PRIVMODE() ? ((mmu_utlb[entryNo].flags & TLB_WRITABLE) == 0)
 100.738 +		: ((mmu_utlb[entryNo].flags & TLB_USERWRITABLE) != TLB_USERWRITABLE) ) {
 100.739 +		/* protection violation */
 100.740 +		MMU_TLB_WRITE_PROT_ERROR(addr);
 100.741 +		return FALSE;
 100.742 +	    }
 100.743 +	    
 100.744 +	    if( (mmu_utlb[entryNo].flags & TLB_DIRTY) == 0 ) {
 100.745 +		MMU_TLB_INITIAL_WRITE_ERROR(addr);
 100.746 +		return FALSE;
 100.747 +	    }
 100.748 +	    
 100.749 +	    /* finally generate the target address */
 100.750 +	    target = ((mmu_utlb[entryNo].ppn & mmu_utlb[entryNo].mask) | 
 100.751 +		      (addr & (~mmu_utlb[entryNo].mask))) & 0xFFFFFFE0;
 100.752 +	}
 100.753 +    } else {
 100.754 +	uint32_t hi = (MMIO_READ( MMU, (queue == 0 ? QACR0 : QACR1) ) & 0x1C) << 24;
 100.755 +	target = (addr&0x03FFFFE0) | hi;
 100.756 +    }
 100.757 +    mem_copy_to_sh4( target, src, 32 );
 100.758 +    return TRUE;
 100.759 +}
 100.760 +