From 3c37ab44c4a3e2e0c2a943a70007522721c46229 Mon Sep 17 00:00:00 2001 From: Seg Date: Tue, 1 Dec 2020 00:37:45 -0800 Subject: [PATCH 1/2] Change SheepShaver default build to direct addressing. --- SheepShaver/src/Unix/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SheepShaver/src/Unix/configure.ac b/SheepShaver/src/Unix/configure.ac index 749ebdff..d2cca7ca 100755 --- a/SheepShaver/src/Unix/configure.ac +++ b/SheepShaver/src/Unix/configure.ac @@ -57,13 +57,13 @@ AC_ARG_WITH(libvhd, dnl Addressing mode AC_ARG_ENABLE(addressing, - [ --enable-addressing=AM set the addressing mode to use [default=real]], + [ --enable-addressing=AM set the addressing mode to use [default=direct]], [case "$enableval" in real) WANT_ADDRESSING_MODE="real";; direct) WANT_ADDRESSING_MODE="direct";; direct,0x*) WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\([[UuLl]]\{1,2\}\)\?\)$/s//\1/p'`;; esac], - [WANT_ADDRESSING_MODE="real"] + [WANT_ADDRESSING_MODE="direct"] ) dnl SDL options. From 9138da0da950f048ada64f9d0217b1e96c01b65c Mon Sep 17 00:00:00 2001 From: rakslice Date: Thu, 3 Dec 2020 00:48:21 -0800 Subject: [PATCH 2/2] disable precompiled dyngens pending rebuild for the new default addressing mode --- SheepShaver/src/Unix/configure.ac | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/SheepShaver/src/Unix/configure.ac b/SheepShaver/src/Unix/configure.ac index d2cca7ca..04ee6281 100755 --- a/SheepShaver/src/Unix/configure.ac +++ b/SheepShaver/src/Unix/configure.ac @@ -1595,12 +1595,14 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then fi if [[ -z "$DYNGEN_CC" -o "x$DYNGEN_CC" = "xprecompiled" ]]; then case $host_cpu in - i?86) - ac_cv_use_dyngen_precompiled=yes - ;; - x86_64) - ac_cv_use_dyngen_precompiled=yes - ;; + # precompiled dyngens need rebuilds for the new default of direct addressing + + #i?86) + # ac_cv_use_dyngen_precompiled=yes + # ;; + #x86_64) + # ac_cv_use_dyngen_precompiled=yes + # ;; *) ac_cv_use_dyngen=no ;;