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

enable build of the cpu tester from the SheepShaver tree

Browse Source
This commit is contained in:
gbeauche 2004-11-25 19:14:15 +00:00
parent 6d68826725
commit 6287978c19
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SheepShaver/src/Unix/Makefile.in
View File

@ -23,6 +23,7 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
SYSSRCS = @SYSSRCS@ SYSSRCS = @SYSSRCS@
CPUSRCS = @CPUSRCS@ CPUSRCS = @CPUSRCS@
MONSRCS = @MONSRCS@
DYNGENSRCS = @DYNGENSRCS@ DYNGENSRCS = @DYNGENSRCS@
DYNGEN_CC = @DYNGEN_CC@ DYNGEN_CC = @DYNGEN_CC@
DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@ DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
@ -42,7 +43,7 @@ SRCS = main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp sys_unix.cpp
../serial.cpp ../extfs.cpp \ ../serial.cpp ../extfs.cpp \
about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \ about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
vm_alloc.cpp sigsegv.cpp \ vm_alloc.cpp sigsegv.cpp \
sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS)
APP = SheepShaver APP = SheepShaver
APP_EXE = $(APP)$(EXEEXT) APP_EXE = $(APP)$(EXEEXT)
APP_APP = $(APP).app APP_APP = $(APP).app
@ -163,5 +164,21 @@ $(OBJ_DIR)/ppc-execute.o: ppc-execute-impl.cpp
ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/ppc/ppc-decode.cpp $(GENEXEC) $(DYNGENDEPS) ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/ppc/ppc-decode.cpp $(GENEXEC) $(DYNGENDEPS)
$(CPP) $(CPPFLAGS) -DGENEXEC $< | $(GENEXEC) > $@ $(CPP) $(CPPFLAGS) -DGENEXEC $< | $(GENEXEC) > $@
# PowerPC CPU tester
TESTSRCS_ = cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp mathlib/ieeefp.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp
TESTSRCS = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp)
define TESTSRCS_LIST_TO_OBJS
$(addprefix $(OBJ_DIR)/, $(addsuffix .o, $(foreach file, $(TESTSRCS), \
$(basename $(notdir $(file))))))
endef
TESTOBJS = $(TESTSRCS_LIST_TO_OBJS)
$(OBJ_DIR)/test-powerpc.o: $(kpxsrcdir)/test/test-powerpc.cpp
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -DEMU_KHEPERIX -c $< -o $@
test-powerpc$(EXEEXT): $(TESTOBJS)
$(CXX) -o $@ $(LDFLAGS) $(TESTOBJS) $(LIBS)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# DO NOT DELETE THIS LINE -- make depend depends on it. # DO NOT DELETE THIS LINE -- make depend depends on it.

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

@ -105,6 +105,7 @@ if [[ "x$WANT_MON" = "xyes" ]]; then
WANT_MON=no WANT_MON=no
fi fi
fi fi
AC_SUBST(MONSRCS)
dnl Checks for libraries. dnl Checks for libraries.
AC_CHECK_LIB(posix4, sem_init) AC_CHECK_LIB(posix4, sem_init)
@ -445,7 +446,7 @@ if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
AUDIOSRC="../SDL/audio_sdl.cpp" AUDIOSRC="../SDL/audio_sdl.cpp"
fi fi
SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS" SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
dnl Define a macro that translates a yesno-variable into a C macro definition dnl Define a macro that translates a yesno-variable into a C macro definition
dnl to be put into the config.h file dnl to be put into the config.h file

25
SheepShaver/src/kpx_cpu/src/test/test-powerpc.cpp
View File

@ -29,6 +29,10 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#ifndef USE_JIT
#define USE_JIT 0
#endif
#if EMU_KHEPERIX #if EMU_KHEPERIX
#include "sysdeps.h" #include "sysdeps.h"
#include "cpu/ppc/ppc-cpu.hpp" #include "cpu/ppc/ppc-cpu.hpp"
@ -159,6 +163,25 @@ static void inline ppc_flush_icache_range(uint32 *start_p, uint32 length)
#endif #endif
#if EMU_KHEPERIX #if EMU_KHEPERIX
// Wrappers when building from SheepShaver tree
#ifdef SHEEPSHAVER
int64 TimebaseSpeed = 25000000; // Default: 25 MHz
uint32 PVR = 0x000c0000; // Default: 7400 (with AltiVec)
uint64 GetTicks_usec(void)
{
return clock();
}
void init_emul_op_trampolines(basic_dyngen & dg)
{
}
#define ENABLE_JIT_P (USE_JIT && 1)
#else
#define ENABLE_JIT_P NULL
#endif
struct powerpc_cpu_base struct powerpc_cpu_base
: public powerpc_cpu : public powerpc_cpu
{ {
@ -179,7 +202,7 @@ struct powerpc_cpu_base
}; };
powerpc_cpu_base::powerpc_cpu_base() powerpc_cpu_base::powerpc_cpu_base()
: powerpc_cpu(NULL) : powerpc_cpu(ENABLE_JIT_P)
{ {
init_decoder(); init_decoder();
} }