Skip to content

P
PUAE
Commit dc18d9f0 authored by mtufan's avatar mtufan
Browse files
Options

puae 2.3.3

parent 4ff48558
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 286 additions and 167 deletions
build_macos_qt.sh
View file @ dc18d9f0
...@@ -12,6 +12,6 @@ other=" --with-caps --enable-amax " ...@@ -12,6 +12,6 @@ other=" --with-caps --enable-amax "
# #
# #
./bootstrap.sh ./bootstrap.sh
./configure $base $cd32 $a600 $scsi $other CFLAGS="-m32" LDFLAGS="-m32" CPPFLAGS="-m32" ./configure $base $cd32 $a600 $scsi $other CFLAGS="-m32" LDFLAGS="-m32" CPPFLAGS="-m32" CXXFLAGS="-m32"
make clean make clean
make make
configure.in
View file @ dc18d9f0
...@@ -79,10 +79,20 @@ dnl ...@@ -79,10 +79,20 @@ dnl
HAVE_QT=no HAVE_QT=no
AC_MSG_CHECKING(QT version via qmake) AC_MSG_CHECKING(QT version via qmake)
if test -z "$QMAKE"; then if test -z "$QMAKE"; then
dnl AC_MSG_NOTICE([QMAKE env not set, we'll try to find it on our own]) AC_MSG_NOTICE([QMAKE env not set..])
QMAKE=`which qmake` QMAKE=`which qmake`
if test -z "$QMAKE"; then if test -z "$QMAKE"; then
AC_MSG_NOTICE([Can't find qmake]) AC_MSG_NOTICE([Can't find which qmake..])
dnl maybe qmake is in the path
qmake_version=`qmake -query QT_VERSION 2>&1`
if test -z "$qmake_version"; then
AC_MSG_NOTICE([Can't find qmake in PATH..])
else
QMAKE=`qmake -query QT_INSTALL_BINS 2>&1`
QMAKE="$QMAKE/qmake"
HAVE_QT=yes
AC_MSG_RESULT( $qmake_version )
fi
else else
HAVE_QT=yes HAVE_QT=yes
qmake_version=`$QMAKE -query QT_VERSION 2>&1` qmake_version=`$QMAKE -query QT_VERSION 2>&1`
...@@ -98,10 +108,9 @@ dnl ...@@ -98,10 +108,9 @@ dnl
dnl if QT dnl if QT
dnl dnl
if [[ "x$HAVE_QT" = "xyes" ]]; then if [[ "x$HAVE_QT" = "xyes" ]]; then
AC_MSG_CHECKING(QT: Meta Object Compiler) AC_MSG_CHECKING(QT: Meta Object Compiler)
if test -z "$QT_MOC"; then if test -z "$QT_MOC"; then
dnl AC_MSG_NOTICE([QT_MOC env not set, we'll try to find it on our own]) AC_MSG_NOTICE([QT_MOC env not set..])
QT_MOC=`which moc` QT_MOC=`which moc`
if test -z "$QT_MOC"; then if test -z "$QT_MOC"; then
AC_MSG_NOTICE([Can't find moc]) AC_MSG_NOTICE([Can't find moc])
...@@ -112,7 +121,7 @@ fi ...@@ -112,7 +121,7 @@ fi
AC_MSG_CHECKING(QT: User Interface Compiler) AC_MSG_CHECKING(QT: User Interface Compiler)
if test -z "$QT_UIC"; then if test -z "$QT_UIC"; then
dnl AC_MSG_NOTICE([QT_UIC env not set, we'll try to find it on our own]) dnl AC_MSG_NOTICE([QT_UIC env not set..])
QT_UIC=`which uic` QT_UIC=`which uic`
if test -z "$QT_UIC"; then if test -z "$QT_UIC"; then
AC_MSG_NOTICE([Can't find uic]) AC_MSG_NOTICE([Can't find uic])
...@@ -123,7 +132,7 @@ fi ...@@ -123,7 +132,7 @@ fi
AC_MSG_CHECKING(QT: Resource Compiler) AC_MSG_CHECKING(QT: Resource Compiler)
if test -z "$QT_RCC"; then if test -z "$QT_RCC"; then
dnl AC_MSG_NOTICE([QT_RCC env not set, we'll try to find it on our own]) dnl AC_MSG_NOTICE([QT_RCC env not set..])
QT_RCC=`which rcc` QT_RCC=`which rcc`
if test -z "$QT_RCC"; then if test -z "$QT_RCC"; then
AC_MSG_NOTICE([Can't find rcc]) AC_MSG_NOTICE([Can't find rcc])
...@@ -1365,11 +1374,13 @@ if [[ "x$WANT_SCSIEMU" = "xyes" ]]; then ...@@ -1365,11 +1374,13 @@ if [[ "x$WANT_SCSIEMU" = "xyes" ]]; then
else else
if [[ "$OSDEP" = "od-amiga" ]]; then if [[ "$OSDEP" = "od-amiga" ]]; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) scsi.$(OBJEXT)' dnl SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) scsi.$(OBJEXT)'
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) scsi.$(OBJEXT)'
UAE_DEFINES="$UAE_DEFINES -DSCSIEMU" UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
if [[ "x$WANT_A2091" = "xyes" ]]; then if [[ "x$WANT_A2091" = "xyes" ]]; then
UAE_DEFINES="$UAE_DEFINES -DA2091" UAE_DEFINES="$UAE_DEFINES -DA2091"
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)' dnl SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
fi fi
NEED_THREAD_SUPPORT=yes NEED_THREAD_SUPPORT=yes
else else
...@@ -1403,11 +1414,13 @@ typedef int BOOL; ...@@ -1403,11 +1414,13 @@ typedef int BOOL;
[{SCSI *scgp = scg_open (0, 0, 0, 0, 0);}], [{SCSI *scgp = scg_open (0, 0, 0, 0, 0);}],
[ [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT)' dnl SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT)'
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT)'
UAE_DEFINES="$UAE_DEFINES -DSCSIEMU" UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
if [[ "x$WANT_A2091" = "xyes" ]]; then if [[ "x$WANT_A2091" = "xyes" ]]; then
UAE_DEFINES="$UAE_DEFINES -DA2091" UAE_DEFINES="$UAE_DEFINES -DA2091"
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)' dnl SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
fi fi
UAE_CPPFLAGS="$UAE_CPPFLAGS $LIBSCG_CPPFLAGS" UAE_CPPFLAGS="$UAE_CPPFLAGS $LIBSCG_CPPFLAGS"
UAE_LIBS="$LIBSCG_LIBS $UAE_LIBS" UAE_LIBS="$LIBSCG_LIBS $UAE_LIBS"
...@@ -1428,11 +1441,13 @@ typedef int BOOL; ...@@ -1428,11 +1441,13 @@ typedef int BOOL;
[{SCSI *scgp = scg_open (0, 0, 0, 0, 0);}], [{SCSI *scgp = scg_open (0, 0, 0, 0, 0);}],
[ [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT)' dnl SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT)'
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT)'
UAE_DEFINES="$UAE_DEFINES -DSCSIEMU" UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
if [[ "x$WANT_A2091" = "xyes" ]]; then if [[ "x$WANT_A2091" = "xyes" ]]; then
UAE_DEFINES="$UAE_DEFINES -DA2091" UAE_DEFINES="$UAE_DEFINES -DA2091"
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)' dnl SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
fi fi
NEED_THREAD_SUPPORT=yes NEED_THREAD_SUPPORT=yes
if [[ "$srcdir" != "." ]]; then if [[ "$srcdir" != "." ]]; then
...@@ -1454,11 +1469,13 @@ dnl AC_CONFIG_LINKS(src/libschily.a:src/libschily.a) ...@@ -1454,11 +1469,13 @@ dnl AC_CONFIG_LINKS(src/libschily.a:src/libschily.a)
[{struct cdrom_generic_command cmd; ioctl (0, CDROM_SEND_PACKET, &cmd);}], [{struct cdrom_generic_command cmd; ioctl (0, CDROM_SEND_PACKET, &cmd);}],
[ [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) scsi.$(OBJEXT)' dnl SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) scsi.$(OBJEXT)'
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) scsi.$(OBJEXT)'
UAE_DEFINES="$UAE_DEFINES -DSCSIEMU -DSCSIEMU_LINUX_IOCTL" UAE_DEFINES="$UAE_DEFINES -DSCSIEMU -DSCSIEMU_LINUX_IOCTL"
if [[ "x$WANT_A2091" = "xyes" ]]; then if [[ "x$WANT_A2091" = "xyes" ]]; then
UAE_DEFINES="$UAE_DEFINES -DA2091" UAE_DEFINES="$UAE_DEFINES -DA2091"
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)' dnl SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev_cdimage.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
fi fi
NEED_THREAD_SUPPORT=yes NEED_THREAD_SUPPORT=yes
], ],
...@@ -1752,12 +1769,10 @@ dnl 64 bit? ...@@ -1752,12 +1769,10 @@ dnl 64 bit?
dnl //mtufan dnl //mtufan
dnl dnl
is_64bit=no is_64bit=no
is_64bit=yes
AC_MSG_CHECKING([whether CPU is 64bit]) AC_MSG_CHECKING([whether CPU is 64bit])
if [[ "$HOST_CPU" = amd64 ]]; then if [[ "$HOST_CPU" = amd64 ]]; then
is_64bit=yes is_64bit=yes
AC_DEFINE(CPU_64_BIT,1,[CPU is 64bit]) UAE_DEFINES="$UAE_DEFINES -D__x86_64__"
UAE_DEFINES="$UAE_DEFINES -DCPU_64_BIT -D__x86_64__"
fi fi
AC_MSG_RESULT([$is_64bit]) AC_MSG_RESULT([$is_64bit])
......
docs/compiling.txt
View file @ dc18d9f0
...@@ -13,7 +13,6 @@ Currently zlib is also required to build PUAE for all supported ...@@ -13,7 +13,6 @@ Currently zlib is also required to build PUAE for all supported
platforms. This isn't much of hardship since zlib is available platforms. This isn't much of hardship since zlib is available
everywhere, but shout loudly enough and I'll fix this. everywhere, but shout loudly enough and I'll fix this.
Required Stuff Required Stuff
============== ==============
(for debian based Linux) (for debian based Linux)
...@@ -22,7 +21,6 @@ apt-get install automake ...@@ -22,7 +21,6 @@ apt-get install automake
apt-get install zlib1g apt-get install zlib1g
apt-get install libsdl1.2-dev apt-get install libsdl1.2-dev
apt-get install libgtk2.0-dev apt-get install libgtk2.0-dev
apt-get install xorg-core
Configuring Configuring
......
src/Makefile.am
View file @ dc18d9f0
...@@ -178,7 +178,7 @@ EXTRA_uae_SOURCES = \ ...@@ -178,7 +178,7 @@ EXTRA_uae_SOURCES = \
debug.c identify.c filesys.c filesys_bootrom.c fsdb.c fsdb_unix.c fsusage.c genblitter.c \ debug.c identify.c filesys.c filesys_bootrom.c fsdb.c fsdb_unix.c fsusage.c genblitter.c \
gencpu.c gengenblitter.c gencomp.c genlinetoscr.c hardfile.c \ gencpu.c gengenblitter.c gencomp.c genlinetoscr.c hardfile.c \
hardfile_unix.c scsi-none.c scsiemul.c svgancui.c tui.c \ hardfile_unix.c scsi-none.c scsiemul.c svgancui.c tui.c \
blkdev-libscg.c blkdev_cdimage.c filesys_unix.c amax.c \ blkdev-libscg.c filesys_unix.c amax.c \
akiko.c cd32_fmv.c ar.c blkdev.c blitops.c scsi.c \ akiko.c cd32_fmv.c ar.c blkdev.c blitops.c scsi.c \
writelog.c writelog.c
......
src/cfgfile.c
View file @ dc18d9f0
...@@ -536,7 +536,7 @@ static void subst_home (char *f, int n) ...@@ -536,7 +536,7 @@ static void subst_home (char *f, int n)
char *str = cfgfile_subst_path ("~", home, f); char *str = cfgfile_subst_path ("~", home, f);
strncpy (f, str, n - 1); strncpy (f, str, n - 1);
f[n - 1] = '\0'; f[n - 1] = '\0';
free (str); //FIXME: free (str);
} }
} }
...@@ -2871,8 +2871,7 @@ static void subst (TCHAR *p, TCHAR *f, int n) ...@@ -2871,8 +2871,7 @@ static void subst (TCHAR *p, TCHAR *f, int n)
TCHAR *str = cfgfile_subst_path (UNEXPANDED, p, f); TCHAR *str = cfgfile_subst_path (UNEXPANDED, p, f);
_tcsncpy (f, str, n - 1); _tcsncpy (f, str, n - 1);
f[n - 1] = '\0'; f[n - 1] = '\0';
//FIXME: //FIXME: free (str);
free (str);
} }
static char *cfg_fgets (char *line, int max, struct zfile *fh) static char *cfg_fgets (char *line, int max, struct zfile *fh)
......
src/compemu.h
View file @ dc18d9f0
#include "flags_x86.h" #include "flags_x86.h"
#ifdef CPU_64_BIT #ifdef __x86_64__
typedef uae_u64 uintptr; typedef uae_u64 uintptr;
#else #else
typedef uae_u32 uintptr; typedef uae_u32 uintptr;
......
src/compemu_raw_x86.c
View file @ dc18d9f0
...@@ -1695,7 +1695,7 @@ static uae_u8 *veccode; ...@@ -1695,7 +1695,7 @@ static uae_u8 *veccode;
#ifdef _WIN32 #ifdef _WIN32
#if defined(CPU_64_BIT) #if defined(__x86_64__)
#define ctxPC (pContext->Rip) #define ctxPC (pContext->Rip)
#else #else
#define ctxPC (pContext->Eip) #define ctxPC (pContext->Eip)
...@@ -1811,7 +1811,7 @@ int EvalException (LPEXCEPTION_POINTERS blah, int n_except) ...@@ -1811,7 +1811,7 @@ int EvalException (LPEXCEPTION_POINTERS blah, int n_except)
#endif #endif
switch(r) { switch(r) {
#if defined(CPU_64_BIT) #if defined(__x86_64__)
case 0: pr=&(pContext->Rax); break; case 0: pr=&(pContext->Rax); break;
case 1: pr=&(pContext->Rcx); break; case 1: pr=&(pContext->Rcx); break;
case 2: pr=&(pContext->Rdx); break; case 2: pr=&(pContext->Rdx); break;
......
src/gui-qt/Makefile.am
View file @ dc18d9f0
...@@ -16,6 +16,8 @@ INCLUDES += -I/Library/Frameworks/QtGui.framework/Versions/4/Headers ...@@ -16,6 +16,8 @@ INCLUDES += -I/Library/Frameworks/QtGui.framework/Versions/4/Headers
endif endif
DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
LIBS = -L/usr/lib -lQtGui -lQtCore -lpthread LIBS = -L/usr/lib -lQtGui -lQtCore -lpthread
##QMAKE_CFLAGS = $(QMAKE_CFLAGS) ) -m32
##QMAKE_CXXFLAGS = $(QMAKE_CXXFLAGS) -m32
AM_CPPFLAGS = @UAE_CPPFLAGS@ AM_CPPFLAGS = @UAE_CPPFLAGS@
AM_CPPFLAGS += -I$(top_srcdir)/src/include -I$(top_builddir)/src -I$(top_srcdir)/src AM_CPPFLAGS += -I$(top_srcdir)/src/include -I$(top_builddir)/src -I$(top_srcdir)/src
......
src/gui-qt/PUAE.pro.user
View file @ dc18d9f0
This diff is collapsed.
src/gui-qt/puae_mainwindow.cpp
View file @ dc18d9f0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* QT GUI for PUAE * QT GUI for PUAE
* *
* Copyright 2010 Mustafa 'GnoStiC' TUFAN * Copyright 2010-2011 Mustafa 'GnoStiC' TUFAN
* (GUI layout cloned from WinUAE/Toni Wilen) * (GUI layout cloned from WinUAE/Toni Wilen)
* *
*/ */
...@@ -41,6 +41,7 @@ extern bool canbang; ...@@ -41,6 +41,7 @@ extern bool canbang;
struct uae_prefs workprefs; struct uae_prefs workprefs;
// REMOVEME>tmp // REMOVEME>tmp
#define CYCLE_UNIT 512
extern const char *uae_archive_extensions[]; extern const char *uae_archive_extensions[];
#ifdef ARCADIA #ifdef ARCADIA
extern struct romdata *scan_arcadia_rom (char*, int); extern struct romdata *scan_arcadia_rom (char*, int);
...@@ -51,7 +52,7 @@ extern struct romdata *scan_arcadia_rom (char*, int); ...@@ -51,7 +52,7 @@ extern struct romdata *scan_arcadia_rom (char*, int);
// //
int full_property_sheet = 1; int full_property_sheet = 1;
// Paths Tab // Paths Tab
QString PATHS_ROM, PATHS_CONFIG, PATHS_SCREENSHOT, PATHS_SAVESTATE, PATHS_AVIOUTPUT, PATHS_SAVEIMAGE, PATHS_RIP; QString PATHS_ROM, PATHS_CONFIG, PATHS_SCREENSHOT, PATHS_SAVESTATE, PATHS_AVIOUTPUT, PATHS_SAVEIMAGE, PATHS_RIP;
// mem // mem
...@@ -129,7 +130,8 @@ puae_MainWindow::puae_MainWindow(QWidget *parent) : ...@@ -129,7 +130,8 @@ puae_MainWindow::puae_MainWindow(QWidget *parent) :
PATHS_AVIOUTPUT = myPath; PATHS_AVIOUTPUT = myPath;
PATHS_SAVEIMAGE = myPath; PATHS_SAVEIMAGE = myPath;
PATHS_RIP = myPath; PATHS_RIP = myPath;
workprefs = currprefs;
// USER // USER
values_to_expansiondlg (); values_to_expansiondlg ();
enable_for_expansiondlg (); enable_for_expansiondlg ();
...@@ -195,6 +197,8 @@ void puae_MainWindow::on_IDC_PATHS_ROMS_clicked() ...@@ -195,6 +197,8 @@ void puae_MainWindow::on_IDC_PATHS_ROMS_clicked()
{ {
PATHS_ROM = GetPath(this, "Select System ROMS Path", PATHS_ROM); PATHS_ROM = GetPath(this, "Select System ROMS Path", PATHS_ROM);
ui->IDC_PATHS_ROM->setText (PATHS_ROM); ui->IDC_PATHS_ROM->setText (PATHS_ROM);
//if (!scan_roms())
// notice
} }
/* Choose Configuration Files Path */ /* Choose Configuration Files Path */
...@@ -291,58 +295,77 @@ void puae_MainWindow::on_IDC_KICKSHIFTER_toggled(bool ischecked) ...@@ -291,58 +295,77 @@ void puae_MainWindow::on_IDC_KICKSHIFTER_toggled(bool ischecked)
/* CPU 68000 */ /* CPU 68000 */
void puae_MainWindow::on_IDC_CPU0_clicked() void puae_MainWindow::on_IDC_CPU0_clicked()
{ {
workprefs.cpu_model = 0; workprefs.cpu_model = 68000;
enable_for_cpudlg ();
} }
/* CPU 68010 */ /* CPU 68010 */
void puae_MainWindow::on_IDC_CPU1_clicked() void puae_MainWindow::on_IDC_CPU1_clicked()
{ {
workprefs.cpu_model = 1; workprefs.cpu_model = 68010;
enable_for_cpudlg ();
} }
/* CPU 68020 */ /* CPU 68020 */
void puae_MainWindow::on_IDC_CPU2_clicked() void puae_MainWindow::on_IDC_CPU2_clicked()
{ {
workprefs.cpu_model = 2; workprefs.cpu_model = 68020;
enable_for_cpudlg ();
} }
/* CPU 68030 */ /* CPU 68030 */
void puae_MainWindow::on_IDC_CPU3_clicked() void puae_MainWindow::on_IDC_CPU3_clicked()
{ {
workprefs.cpu_model = 3; workprefs.cpu_model = 68030;
enable_for_cpudlg ();
} }
/* CPU 68040 */ /* CPU 68040 */
void puae_MainWindow::on_IDC_CPU4_clicked() void puae_MainWindow::on_IDC_CPU4_clicked()
{ {
workprefs.cpu_model = 4; workprefs.cpu_model = 68040;
enable_for_cpudlg ();
} }
/* CPU 68060 */ /* CPU 68060 */
void puae_MainWindow::on_IDC_CPU5_clicked() void puae_MainWindow::on_IDC_CPU5_clicked()
{ {
workprefs.cpu_model = 5; workprefs.cpu_model = 68060;
enable_for_cpudlg ();
} }
/* 24-bit Addressing */ /* 24-bit Addressing */
void puae_MainWindow::on_IDC_COMPATIBLE24_toggled(bool ischecked) void puae_MainWindow::on_IDC_COMPATIBLE24_toggled(bool ischecked)
{ {
workprefs.address_space_24 = ischecked; workprefs.address_space_24 = ischecked;
enable_for_cpudlg ();
} }
/* More Compatible */ /* More Compatible */
void puae_MainWindow::on_IDC_COMPATIBLE_toggled(bool ischecked) void puae_MainWindow::on_IDC_COMPATIBLE_toggled(bool ischecked)
{ {
workprefs.cpu_compatible = ischecked; workprefs.cpu_compatible = ischecked;
enable_for_cpudlg ();
} }
/* JIT Enable */ /* JIT Enable */
void puae_MainWindow::on_IDC_JITENABLE_toggled(bool ischecked) void puae_MainWindow::on_IDC_JITENABLE_toggled(bool ischecked)
{ {
// cachesize_prev = workprefs.cachesize; //
// trust_prev = workprefs.comptrustbyte; enable_for_cpudlg ();
}
/* JIT Cache Size */
void puae_MainWindow::on_IDC_CACHE_valueChanged(int value)
{
char foo[30];
value = value *1024;
workprefs.cachesize = value;
workprefs.cachesize = 0; sprintf (foo, "%d", value);
ui->IDC_CACHETEXT->setText(foo);
} }
/*68040 MMU Enable */ /*68040 MMU Enable */
...@@ -1702,9 +1725,10 @@ void puae_MainWindow::values_from_cpudlg () ...@@ -1702,9 +1725,10 @@ void puae_MainWindow::values_from_cpudlg ()
workprefs.fpu_strict = ui->IDC_COMPATIBLE_FPU->isChecked() ? 1 : 0; workprefs.fpu_strict = ui->IDC_COMPATIBLE_FPU->isChecked() ? 1 : 0;
#endif #endif
workprefs.address_space_24 = ui->IDC_COMPATIBLE24->isChecked() ? 1 : 0; workprefs.address_space_24 = ui->IDC_COMPATIBLE24->isChecked() ? 1 : 0;
/* workprefs.m68k_speed = ui->IDC_CS_HOST->isChecked() ? -1 workprefs.m68k_speed = ui->IDC_CS_HOST->isChecked() ? -1
: ui->IDC_CS_68000->isChecked() ? 0 : ui->IDC_CS_68000->isChecked() ? 0
: SendMessage (GetDlgItem (hDlg, IDC_SPEED), TBM_GETPOS, 0, 0) * CYCLE_UNIT;*/ : ui->IDC_SPEED->value() * CYCLE_UNIT;
workprefs.mmu_model = ui->IDC_MMUENABLE->isChecked() ? 68040 : 0; workprefs.mmu_model = ui->IDC_MMUENABLE->isChecked() ? 68040 : 0;
newcpu = ui->IDC_CPU0->isChecked() ? 68000 newcpu = ui->IDC_CPU0->isChecked() ? 68000
...@@ -1719,8 +1743,10 @@ void puae_MainWindow::values_from_cpudlg () ...@@ -1719,8 +1743,10 @@ void puae_MainWindow::values_from_cpudlg ()
: ui->IDC_FPU3->isChecked() ? 3 : 0; : ui->IDC_FPU3->isChecked() ? 3 : 0;
/* When switching away from 68000, disable 24 bit addressing. */ /* When switching away from 68000, disable 24 bit addressing. */
if (workprefs.cpu_model != newcpu && newcpu <= 68010)
newfpu = 0;
workprefs.cpu_model = newcpu; workprefs.cpu_model = newcpu;
switch(newcpu) switch (newcpu)
{ {
case 68000: case 68000:
case 68010: case 68010:
...@@ -1761,12 +1787,10 @@ void puae_MainWindow::values_from_cpudlg () ...@@ -1761,12 +1787,10 @@ void puae_MainWindow::values_from_cpudlg ()
workprefs.compfpu = ui->IDC_JITFPU->isChecked(); workprefs.compfpu = ui->IDC_JITFPU->isChecked();
workprefs.comp_hardflush = ui->IDC_HARDFLUSH->isChecked(); workprefs.comp_hardflush = ui->IDC_HARDFLUSH->isChecked();
workprefs.comp_constjump = ui->IDC_CONSTJUMP->isChecked(); workprefs.comp_constjump = ui->IDC_CONSTJUMP->isChecked();
#endif
#ifdef JIT
oldcache = workprefs.cachesize; oldcache = workprefs.cachesize;
jitena = ui->IDC_JITENABLE->isChecked() ? 1 : 0; jitena = ui->IDC_JITENABLE->isChecked() ? 1 : 0;
// workprefs.cachesize = SendMessage (GetDlgItem (hDlg, IDC_CACHE), TBM_GETPOS, 0, 0) * 1024;
if (!jitena) { if (!jitena) {
cachesize_prev = workprefs.cachesize; cachesize_prev = workprefs.cachesize;
trust_prev = workprefs.comptrustbyte; trust_prev = workprefs.comptrustbyte;
...@@ -1784,21 +1808,15 @@ void puae_MainWindow::values_from_cpudlg () ...@@ -1784,21 +1808,15 @@ void puae_MainWindow::values_from_cpudlg ()
if (oldcache == 0 && candirect && workprefs.cachesize > 0) if (oldcache == 0 && candirect && workprefs.cachesize > 0)
canbang = 1; canbang = 1;
#endif #endif
// workprefs.cpu_idle = SendMessage (GetDlgItem (hDlg, IDC_CPUIDLE), TBM_GETPOS, 0, 0); workprefs.cpu_idle = ui->IDC_CPUIDLE->value();
if (workprefs.cpu_idle > 0) if (workprefs.cpu_idle > 0)
workprefs.cpu_idle = (12 - workprefs.cpu_idle) * 15; workprefs.cpu_idle = (12 - workprefs.cpu_idle) * 15;
if (workprefs.cachesize > 0) if (workprefs.cachesize > 0)
workprefs.cpu_compatible = 0; workprefs.cpu_compatible = 0;
/* if (pages[KICKSTART_ID])
SendMessage (pages[KICKSTART_ID], WM_USER, 0, 0); idx = ui->IDC_CPU_FREQUENCY->currentIndex();
if (pages[DISPLAY_ID]) if (idx != -1) {
SendMessage (pages[DISPLAY_ID], WM_USER, 0, 0);
if (pages[MEMORY_ID])
SendMessage (pages[MEMORY_ID], WM_USER, 0, 0);*/
/* idx = SendDlgItemMessage (hDlg, IDC_CPU_FREQUENCY, CB_GETCURSEL, 0, 0);
if (idx != CB_ERR) {
int m = workprefs.cpu_clock_multiplier; int m = workprefs.cpu_clock_multiplier;
workprefs.cpu_frequency = 0; workprefs.cpu_frequency = 0;
workprefs.cpu_clock_multiplier = 0; workprefs.cpu_clock_multiplier = 0;
...@@ -1810,16 +1828,15 @@ void puae_MainWindow::values_from_cpudlg () ...@@ -1810,16 +1828,15 @@ void puae_MainWindow::values_from_cpudlg ()
workprefs.cpu_clock_multiplier = 8 << 8; workprefs.cpu_clock_multiplier = 8 << 8;
if (idx == 3) { if (idx == 3) {
TCHAR txt[20]; TCHAR txt[20];
SendDlgItemMessage (hDlg, IDC_CPU_FREQUENCY2, WM_GETTEXT, (WPARAM)sizeof (txt) / sizeof (TCHAR), (LPARAM)txt); ui->IDC_CPU_FREQUENCY2->text();
workprefs.cpu_clock_multiplier = 0; workprefs.cpu_clock_multiplier = 0;
workprefs.cpu_frequency = _tstof (txt) * 1000000.0; workprefs.cpu_frequency = atof (txt) * 1000000.0;
if (workprefs.cpu_frequency < 1 * 1000000) if (workprefs.cpu_frequency < 1 * 1000000)
workprefs.cpu_frequency = 0; workprefs.cpu_frequency = 0;
if (workprefs.cpu_frequency >= 99 * 1000000) if (workprefs.cpu_frequency >= 99 * 1000000)
workprefs.cpu_frequency = 0; workprefs.cpu_frequency = 0;
} }
} }
*/
} }
void puae_MainWindow::values_from_kickstartdlg () { void puae_MainWindow::values_from_kickstartdlg () {
...@@ -2213,3 +2230,4 @@ void puae_MainWindow::values_from_portsdlg () { ...@@ -2213,3 +2230,4 @@ void puae_MainWindow::values_from_portsdlg () {
void puae_MainWindow::values_to_portsdlg () { void puae_MainWindow::values_to_portsdlg () {
} }
src/gui-qt/puae_mainwindow.h
View file @ dc18d9f0
...@@ -165,6 +165,7 @@ private slots: ...@@ -165,6 +165,7 @@ private slots:
// //
void values_from_kickstartdlg (); void values_from_kickstartdlg ();
void values_to_kickstartdlg (); void values_to_kickstartdlg ();
void on_IDC_CACHE_valueChanged(int value);
}; };
#define TCHAR char #define TCHAR char
......
src/gui-qt/puae_mainwindow.ui
View file @ dc18d9f0
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
<rect> <rect>
<x>206</x> <x>206</x>
<y>20</y> <y>20</y>
<width>295</width> <width>236</width>
<height>25</height> <height>25</height>
</rect> </rect>
</property> </property>
...@@ -506,6 +506,22 @@ ...@@ -506,6 +506,22 @@
</rect> </rect>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="IDC_QUICKSTART_NTSC">
<property name="geometry">
<rect>
<x>445</x>
<y>20</y>
<width>61</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>NTSC</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</widget> </widget>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="geometry"> <property name="geometry">
...@@ -914,6 +930,9 @@ ...@@ -914,6 +930,9 @@
<property name="text"> <property name="text">
<string>More Compatible</string> <string>More Compatible</string>
</property> </property>
<property name="checked">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="QCheckBox" name="IDC_JITENABLE"> <widget class="QCheckBox" name="IDC_JITENABLE">
<property name="geometry"> <property name="geometry">
...@@ -1048,7 +1067,7 @@ ...@@ -1048,7 +1067,7 @@
<string>Fastest possible, but maintain chipset timing</string> <string>Fastest possible, but maintain chipset timing</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" name="IDC_CS_68000"> <widget class="QRadioButton" name="IDC_CS_68000">
...@@ -1063,6 +1082,9 @@ ...@@ -1063,6 +1082,9 @@
<property name="text"> <property name="text">
<string>Approximate A500 or A500/A1200 cycle-exact</string> <string>Approximate A500 or A500/A1200 cycle-exact</string>
</property> </property>
<property name="checked">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="QRadioButton" name="IDC_CS_ADJUSTABLE"> <widget class="QRadioButton" name="IDC_CS_ADJUSTABLE">
<property name="geometry"> <property name="geometry">
...@@ -3946,7 +3968,7 @@ ...@@ -3946,7 +3968,7 @@
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab_host_display"> <widget class="QWidget" name="tab_host_display">
<attribute name="title"> <attribute name="title">
...@@ -4075,6 +4097,31 @@ ...@@ -4075,6 +4097,31 @@
<string>Fullscreen:</string> <string>Fullscreen:</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" name="IDC_BUFFERING">
<property name="geometry">
<rect>
<x>335</x>
<y>75</y>
<width>161</width>
<height>25</height>
</rect>
</property>
<item>
<property name="text">
<string>No buffering</string>
</property>
</item>
<item>
<property name="text">
<string>Double buffering</string>
</property>
</item>
<item>
<property name="text">
<string>Triple buffering</string>
</property>
</item>
</widget>
</widget> </widget>
<widget class="QGroupBox" name="groupBox_21"> <widget class="QGroupBox" name="groupBox_21">
<property name="geometry"> <property name="geometry">
...@@ -4317,6 +4364,19 @@ ...@@ -4317,6 +4364,19 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="IDC_RES_AUTOSWITCH">
<property name="geometry">
<rect>
<x>215</x>
<y>95</y>
<width>171</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Resolution autoswitch</string>
</property>
</widget>
</widget> </widget>
<widget class="QGroupBox" name="groupBox_22"> <widget class="QGroupBox" name="groupBox_22">
<property name="geometry"> <property name="geometry">
...@@ -4415,9 +4475,9 @@ ...@@ -4415,9 +4475,9 @@
<widget class="QPushButton" name="IDC_DA_RESET"> <widget class="QPushButton" name="IDC_DA_RESET">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>345</x> <x>380</x>
<y>355</y> <y>355</y>
<width>166</width> <width>131</width>
<height>26</height> <height>26</height>
</rect> </rect>
</property> </property>
...@@ -4428,7 +4488,7 @@ ...@@ -4428,7 +4488,7 @@
<widget class="QSlider" name="IDC_DA_SLIDER"> <widget class="QSlider" name="IDC_DA_SLIDER">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>140</x>
<y>360</y> <y>360</y>
<width>160</width> <width>160</width>
<height>16</height> <height>16</height>
...@@ -4441,7 +4501,7 @@ ...@@ -4441,7 +4501,7 @@
<widget class="QComboBox" name="IDC_DA_MODE"> <widget class="QComboBox" name="IDC_DA_MODE">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>0</x>
<y>355</y> <y>355</y>
<width>126</width> <width>126</width>
<height>25</height> <height>25</height>
...@@ -4463,6 +4523,16 @@ ...@@ -4463,6 +4523,16 @@
</property> </property>
</item> </item>
</widget> </widget>
<widget class="QLineEdit" name="IDC_BRIGHTNESSTEXT">
<property name="geometry">
<rect>
<x>315</x>
<y>360</y>
<width>41</width>
<height>20</height>
</rect>
</property>
</widget>
</widget> </widget>
<widget class="QWidget" name="tab_host_sound"> <widget class="QWidget" name="tab_host_sound">
<attribute name="title"> <attribute name="title">
...@@ -5042,7 +5112,7 @@ ...@@ -5042,7 +5112,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>45</y> <y>50</y>
<width>351</width> <width>351</width>
<height>25</height> <height>25</height>
</rect> </rect>
...@@ -5062,7 +5132,7 @@ ...@@ -5062,7 +5132,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>20</y> <y>25</y>
<width>160</width> <width>160</width>
<height>16</height> <height>16</height>
</rect> </rect>
...@@ -5078,9 +5148,9 @@ ...@@ -5078,9 +5148,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>195</x> <x>195</x>
<y>15</y> <y>20</y>
<width>76</width> <width>76</width>
<height>25</height> <height>21</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -5088,7 +5158,7 @@ ...@@ -5088,7 +5158,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>280</x> <x>280</x>
<y>15</y> <y>20</y>
<width>82</width> <width>82</width>
<height>25</height> <height>25</height>
</rect> </rect>
...@@ -5612,7 +5682,7 @@ ...@@ -5612,7 +5682,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>40</x> <x>40</x>
<y>15</y> <y>20</y>
<width>406</width> <width>406</width>
<height>25</height> <height>25</height>
</rect> </rect>
...@@ -6026,7 +6096,7 @@ ...@@ -6026,7 +6096,7 @@
<rect> <rect>
<x>15</x> <x>15</x>
<y>30</y> <y>30</y>
<width>91</width> <width>131</width>
<height>26</height> <height>26</height>
</rect> </rect>
</property> </property>
...@@ -6039,7 +6109,7 @@ ...@@ -6039,7 +6109,7 @@
<rect> <rect>
<x>15</x> <x>15</x>
<y>75</y> <y>75</y>
<width>91</width> <width>131</width>
<height>26</height> <height>26</height>
</rect> </rect>
</property> </property>
...@@ -6047,65 +6117,6 @@ ...@@ -6047,65 +6117,6 @@
<string>Save state..</string> <string>Save state..</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_11">
<property name="geometry">
<rect>
<x>180</x>
<y>25</y>
<width>170</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Enable state recording</string>
</property>
</widget>
<widget class="QComboBox" name="comboBox_29">
<property name="geometry">
<rect>
<x>281</x>
<y>85</y>
<width>66</width>
<height>25</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="comboBox_30">
<property name="geometry">
<rect>
<x>281</x>
<y>60</y>
<width>66</width>
<height>25</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_51">
<property name="geometry">
<rect>
<x>120</x>
<y>65</y>
<width>161</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Recording rate (seconds):</string>
</property>
</widget>
<widget class="QLabel" name="label_52">
<property name="geometry">
<rect>
<x>140</x>
<y>90</y>
<width>141</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Recording buffer (MB):</string>
</property>
</widget>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="tab_host_extensions"> <widget class="QWidget" name="tab_host_extensions">
......
src/include/compemu.h
View file @ dc18d9f0
#include "flags_x86.h" #include "flags_x86.h"
#ifdef CPU_64_BIT #ifdef __x86_64__
typedef uae_u64 uintptr; typedef uae_u64 uintptr;
#else #else
typedef uae_u32 uintptr; typedef uae_u32 uintptr;
......
src/memory.c
View file @ dc18d9f0
...@@ -87,7 +87,7 @@ uae_u32 allocated_cardmem; ...@@ -87,7 +87,7 @@ uae_u32 allocated_cardmem;
uae_u8 ce_banktype[65536]; uae_u8 ce_banktype[65536];
uae_u8 ce_cachable[65536]; uae_u8 ce_cachable[65536];
#if defined(CPU_64_BIT) #if defined(__x86_64__)
uae_u32 max_z3fastmem = 2048UL * 1024 * 1024; uae_u32 max_z3fastmem = 2048UL * 1024 * 1024;
#else #else
uae_u32 max_z3fastmem = 512 * 1024 * 1024; uae_u32 max_z3fastmem = 512 * 1024 * 1024;
......
src/od-generic/memory.c
View file @ dc18d9f0
...@@ -123,7 +123,7 @@ void preinit_shm (void) ...@@ -123,7 +123,7 @@ void preinit_shm (void)
free (p96mem_offset); free (p96mem_offset);
p96mem_offset = NULL; p96mem_offset = NULL;
#ifdef CPU_64_BIT #ifdef __x86_64__
max_allowed_mman = 2048; max_allowed_mman = 2048;
#else #else
max_allowed_mman = 1536; max_allowed_mman = 1536;
...@@ -148,7 +148,7 @@ void preinit_shm (void) ...@@ -148,7 +148,7 @@ void preinit_shm (void)
size64 = MAXZ3MEM; size64 = MAXZ3MEM;
else if (maxmem > 0) else if (maxmem > 0)
size64 = maxmem * 1024 * 1024; size64 = maxmem * 1024 * 1024;
#ifdef CPU_64_BIT #ifdef __x86_64__
if (size64 > MAXZ3MEM64) if (size64 > MAXZ3MEM64)
size64 = MAXZ3MEM64; size64 = MAXZ3MEM64;
#else #else
......
src/picasso96.c
View file @ dc18d9f0
...@@ -2201,7 +2201,7 @@ static uae_u32 REGPARAM2 picasso_SetPanning (TrapContext *ctx) ...@@ -2201,7 +2201,7 @@ static uae_u32 REGPARAM2 picasso_SetPanning (TrapContext *ctx)
return 1; return 1;
} }
#ifdef CPU_64_BIT #ifdef __x86_64__
static void do_xor8 (uae_u8 *p, int w, uae_u32 v) static void do_xor8 (uae_u8 *p, int w, uae_u32 v)
{ {
while (ALIGN_POINTER_TO32 (p) != 7 && w) { while (ALIGN_POINTER_TO32 (p) != 7 && w) {
......
src/sysconfig.h.in
View file @ dc18d9f0
/* src/sysconfig.h.in. Generated from configure.in by autoheader. */ /* src/sysconfig.h.in. Generated from configure.in by autoheader. */
/* CPU is 64bit */
#undef CPU_64_BIT
/* we want ecs_denise */ /* we want ecs_denise */
#undef ECS_DENISE #undef ECS_DENISE
......
src/tools/sysconfig.h.in
View file @ dc18d9f0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#undef AC_APPLE_UNIVERSAL_BUILD #undef AC_APPLE_UNIVERSAL_BUILD
/* CPU is 64bit */ /* CPU is 64bit */
#undef CPU_64_BIT #undef __x86_64__
/* we want ecs_denise */ /* we want ecs_denise */
#undef ECS_DENISE #undef ECS_DENISE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment