Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-06-17 21:29:42 +00:00
Code Issues Projects Releases Wiki Activity

SS: can use cxmon

Browse Source
This commit is contained in:
kanjitalk755 2021-02-26 12:21:21 +09:00
parent 2f1f196251
commit 2e5654e583
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SheepShaver/src/Unix/configure.ac
View File

@ -45,7 +45,7 @@ AC_ARG_WITH(gtk, [ --with-gtk use GTK user interface [d
*) WANT_GTK="no";; *) WANT_GTK="no";;
esac], esac],
[WANT_GTK="gtk2 gtk"]) [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(mon, [ --with-mon use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=no])
AC_ARG_WITH(dgcc, [ --with-dgcc=COMPILER use C++ COMPILER to compile synthetic opcodes or 'precompiled'], [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, AC_ARG_WITH(bincue,
@ -115,7 +115,7 @@ x/* | x.*)
WANT_MON=yes WANT_MON=yes
;; ;;
xyes) xyes)
mon_srcdir=../../../mon/src mon_srcdir=../../../cxmon/src
;; ;;
esac esac
if [[ "x$WANT_MON" = "xyes" ]]; then if [[ "x$WANT_MON" = "xyes" ]]; then
@ -123,7 +123,7 @@ if [[ "x$WANT_MON" = "xyes" ]]; then
if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".]) AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c $mon_srcdir/disass/mips-dis.c $mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c" MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass" CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
AC_CHECK_LIB(ncurses, tgetent, , AC_CHECK_LIB(ncurses, tgetent, ,
[AC_CHECK_LIB(termcap, tgetent, , [AC_CHECK_LIB(termcap, tgetent, ,
@ -625,6 +625,7 @@ AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>]) AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>]) AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
AC_CHECK_FRAMEWORK(AppKit, []) AC_CHECK_FRAMEWORK(AppKit, [])
AC_CHECK_FRAMEWORK(Metal, [])
dnl Select system-dependant sources. dnl Select system-dependant sources.
SERIALSRC=serial_unix.cpp SERIALSRC=serial_unix.cpp
@ -1447,7 +1448,7 @@ gcc_AC_C_FLOAT_FORMAT
dnl Platform specific binary postprocessor dnl Platform specific binary postprocessor
AC_PATH_PROG(BLESS, "true") AC_PATH_PROG(BLESS, "true")
if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
BLESS=Darwin/lowmem # BLESS=Darwin/lowmem
LDFLAGS="$LDFLAGS -pagezero_size 0x3000" LDFLAGS="$LDFLAGS -pagezero_size 0x3000"
fi fi

5
SheepShaver/src/kpx_cpu/ppc-dis.c
View File

@ -23,6 +23,7 @@ see <http://www.gnu.org/licenses/>. */
#include <errno.h> #include <errno.h>
#include "dis-asm.h" #include "dis-asm.h"
#include "config.h"
#define BFD_DEFAULT_TARGET_SIZE 64 #define BFD_DEFAULT_TARGET_SIZE 64
@ -5263,6 +5264,8 @@ bfd_vma bfd_getb32 (const bfd_byte *addr)
return (bfd_vma) v; return (bfd_vma) v;
} }
#if !ENABLE_MON
/* Get LENGTH bytes from info's buffer, at target address memaddr. /* Get LENGTH bytes from info's buffer, at target address memaddr.
Transfer them to myaddr. */ Transfer them to myaddr. */
int int
@ -5313,6 +5316,8 @@ generic_symbol_at_address (bfd_vma addr, struct disassemble_info *info)
return 1; return 1;
} }
#endif // !ENABLE_MON
/* Print a PowerPC or POWER instruction. */ /* Print a PowerPC or POWER instruction. */
static int static int