Merge pull request #122 from coderforlife/fix-107
Fixes #107 by automatically using the precompiled opcodes when approp…
This commit is contained in:
asvitkine
GitHub
commit
c6e04efa11
|
|
@ -26,6 +26,7 @@ CPUSRCS = @CPUSRCS@
|
|||
MONSRCS = @MONSRCS@
|
||||
PERL = @PERL@
|
||||
USE_DYNGEN = @USE_DYNGEN@
|
||||
USE_DYNGEN_PRECOMPILED = @USE_DYNGEN_PRECOMPILED@
|
||||
DYNGENSRCS = @DYNGENSRCS@
|
||||
DYNGEN_CC = @DYNGEN_CC@
|
||||
DYNGEN_CFLAGS = @DYNGEN_CFLAGS@
|
||||
|
|
@ -214,9 +215,28 @@ DYNGEN = dyngen$(EXEEXT)
|
|||
ifeq ($(USE_DYNGEN),yes)
|
||||
DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
|
||||
|
||||
ifeq ($(USE_DYNGEN_PRECOMPILED),yes)
|
||||
basic-dyngen-ops.hpp: dyngen_precompiled/basic-dyngen-ops.hpp basic-dyngen-ops-x86_32.hpp basic-dyngen-ops-x86_64.hpp
|
||||
cp -f $< $@
|
||||
basic-dyngen-ops-x86_32.hpp: dyngen_precompiled/basic-dyngen-ops-x86_32.hpp
|
||||
cp -f $< $@
|
||||
basic-dyngen-ops-x86_64.hpp: dyngen_precompiled/basic-dyngen-ops-x86_64.hpp
|
||||
cp -f $< $@
|
||||
ppc-dyngen-ops.hpp: dyngen_precompiled/ppc-dyngen-ops.hpp ppc-dyngen-ops-x86_32.hpp ppc-dyngen-ops-x86_64.hpp
|
||||
cp -f $< $@
|
||||
ppc-dyngen-ops-x86_32.hpp: dyngen_precompiled/ppc-dyngen-ops-x86_32.hpp
|
||||
cp -f $< $@
|
||||
ppc-dyngen-ops-x86_64.hpp: dyngen_precompiled/ppc-dyngen-ops-x86_64.hpp
|
||||
cp -f $< $@
|
||||
else
|
||||
# Only GCC is supported for generating synthetic opcodes
|
||||
$(DYNGEN): $(DYNGENOBJS)
|
||||
$(DYNGEN_CC) -o $@ $(LDFLAGS) $(DYNGENOBJS)
|
||||
basic-dyngen-ops.hpp: $(OBJ_DIR)/basic-dyngen-ops.o $(DYNGEN)
|
||||
./$(DYNGEN) -o $@ $<
|
||||
ppc-dyngen-ops.hpp: $(OBJ_DIR)/ppc-dyngen-ops.o $(DYNGEN)
|
||||
./$(DYNGEN) -o $@ $<
|
||||
endif
|
||||
|
||||
$(OBJ_DIR)/%.dgo : %.c
|
||||
$(DYNGEN_CC) -xc $(CPPFLAGS) $(DEFS) $(DYNGEN_CFLAGS) -c $< -o $@
|
||||
|
|
@ -226,14 +246,10 @@ $(OBJ_DIR)/%.dgo : %.cpp
|
|||
$(OBJ_DIR)/basic-dyngen.o: basic-dyngen-ops.hpp
|
||||
$(OBJ_DIR)/basic-dyngen-ops.o: $(kpxsrcdir)/cpu/jit/basic-dyngen-ops.cpp
|
||||
$(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(DYNGEN_CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
|
||||
basic-dyngen-ops.hpp: $(OBJ_DIR)/basic-dyngen-ops.o $(DYNGEN)
|
||||
./$(DYNGEN) -o $@ $<
|
||||
|
||||
$(OBJ_DIR)/ppc-dyngen.o: ppc-dyngen-ops.hpp
|
||||
$(OBJ_DIR)/ppc-dyngen-ops.o: $(kpxsrcdir)/cpu/ppc/ppc-dyngen-ops.cpp basic-dyngen-ops.hpp
|
||||
$(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(DYNGEN_CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
|
||||
ppc-dyngen-ops.hpp: $(OBJ_DIR)/ppc-dyngen-ops.o $(DYNGEN)
|
||||
./$(DYNGEN) -o $@ $<
|
||||
|
||||
$(OBJ_DIR)/sheepshaver_glue.o $(OBJ_DIR)/ppc-cpu.o $(OBJ_DIR)/ppc-decode.o $(OBJ_DIR)/ppc-translate.o $(OBJ_DIR)/ppc-jit.o: basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ AC_ARG_WITH(gtk, [ --with-gtk use GTK user interface [d
|
|||
esac],
|
||||
[WANT_GTK="gtk2 gtk"])
|
||||
AC_ARG_WITH(mon, [ --with-mon use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
|
||||
AC_ARG_WITH(dgcc, [ --with-dgcc=COMPILER use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
|
||||
AC_ARG_WITH(dgcc, [ --with-dgcc=COMPILER use C++ COMPILER to compile synthetic opcodes or 'precompiled'], [DYNGEN_CC=$withval])
|
||||
|
||||
AC_ARG_WITH(bincue,
|
||||
AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
|
||||
|
|
@ -1434,6 +1434,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
|
|||
[AC_MSG_RESULT(yes); HAVE_GCC30=yes],
|
||||
[AC_MSG_RESULT(no)])
|
||||
|
||||
dnl Check for GCC 4.0 or higher.
|
||||
HAVE_GCC40=no
|
||||
AC_MSG_CHECKING(for GCC 4.0 or higher)
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 4)
|
||||
# error gcc < 4
|
||||
typedef syntax error;
|
||||
#endif
|
||||
]])],
|
||||
[AC_MSG_RESULT(yes); HAVE_GCC40=yes],
|
||||
[AC_MSG_RESULT(no)])
|
||||
|
||||
dnl Check for ICC.
|
||||
AC_MSG_CHECKING(for ICC)
|
||||
HAVE_ICC=no
|
||||
|
|
@ -1506,6 +1517,7 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
|
|||
|
||||
dnl Enable JIT compiler, if possible
|
||||
if [[ "x$WANT_JIT" = "xyes" ]]; then
|
||||
ac_cv_use_dyngen_precompiled=no
|
||||
AC_CACHE_CHECK([whether dyngen can be used],
|
||||
ac_cv_use_dyngen, [
|
||||
case $host_cpu:$ac_cv_object_format in
|
||||
|
|
@ -1536,20 +1548,30 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
|
|||
esac
|
||||
dnl Check for a suitable synthetic opcodes compiler (icc is faking itself as gcc 3.2.2)
|
||||
if [[ -z "$DYNGEN_CC" ]]; then
|
||||
if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
|
||||
if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_GCC40" = "xno" -a "x$HAVE_ICC" = "xno" ]]; then
|
||||
DYNGEN_CC=$CXX
|
||||
else
|
||||
for p in /usr/bin /usr/local/bin /usr/freeware/bin; do
|
||||
gxx="$p/g++"
|
||||
if [[ -x "$gxx" ]]; then
|
||||
DYNGEN_CC="$gxx"
|
||||
fi
|
||||
done
|
||||
elif command -v g++ >/dev/null; then
|
||||
vers=`g++ -dumpversion`
|
||||
function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
|
||||
if [[ $(version $vers) -ge $(version "2.7.0") ]] && [[ $(version $vers) -lt $(version "4.0.0") ]]; then
|
||||
DYNGEN_CC="$gxx"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if [[ -z "$DYNGEN_CC" ]]; then
|
||||
ac_cv_use_dyngen=no
|
||||
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
|
||||
;;
|
||||
*)
|
||||
ac_cv_use_dyngen=no
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
if [[ "x$ac_cv_use_dyngen_precompiled" = "xyes" ]]; then DYNGEN_CC=precompiled; fi
|
||||
])
|
||||
if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
|
||||
case $host_cpu in
|
||||
|
|
@ -1566,10 +1588,17 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
|
|||
;;
|
||||
esac
|
||||
have_dyngen_gcc3=no
|
||||
case "x`$DYNGEN_CC -dumpversion`" in
|
||||
x[12].*) ;;
|
||||
x*) have_dyngen_gcc3=yes ;;
|
||||
esac
|
||||
if [[ "$DYNGEN_CC" != "precompiled" ]]; then
|
||||
case "x`$DYNGEN_CC -dumpversion`" in
|
||||
x[12].*) ;;
|
||||
x*) have_dyngen_gcc3=yes ;;
|
||||
esac
|
||||
else
|
||||
case "x`$CXX -dumpversion`" in
|
||||
x[12].*) ;;
|
||||
x*) have_dyngen_gcc3=yes ;;
|
||||
esac
|
||||
fi
|
||||
if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
|
||||
DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
|
||||
else
|
||||
|
|
@ -1653,6 +1682,7 @@ AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
|
|||
dnl Generate Makefile.
|
||||
AC_SUBST(PERL)
|
||||
AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
|
||||
AC_SUBST(USE_DYNGEN_PRECOMPILED, [$ac_cv_use_dyngen_precompiled])
|
||||
AC_SUBST(DYNGENSRCS)
|
||||
AC_SUBST(DYNGEN_CC)
|
||||
AC_SUBST(DYNGEN_CFLAGS)
|
||||
|
|
|
|||
Loading…
Reference in New Issue