Merge branch 'master' into stable

Conflicts:
	configure.ac
	debian/changelog
	fs-uae.spec

ChangeLog

@@ -1,6 +1,42 @@
+Version 2.5.42dev:
+
+* Map gamepad start button to menu when in Amiga joystick mode (not CD32).
+* Map gamepad select button to pause action.
+* Added/updated some XInput controller configs for DirectInput mode.
+
+Version 2.5.41dev:
+
+* Implement action_pause to make action key configurable.
+* Separate auto-fire button (based on patch from S. Jordan).
+* Dedicated auto-fire button mapped to "right trigger" by default.
+* New boolean option jit_compiler (to enable/disable JIT compilation).
+* New option jit_memory (=direct/indirect).
+* JIT compiler defaults to direct memory access on all platforms now.
+* JIT direct memory exception handler for OS X (32-bit).
+* Imported updated translations from crowdin.com.
+
+Version 2.5.40dev:
+
+* Use SetUnhandledExceptionFilter on Windows for JIT direct memory.
+* Unified (segfault) exception handler for Windows and Linux.
+* Fixed mman for compatibility with JIT direct memory access.
+* Re-enable uae_comp_trust* = indirectKS options.
+* Allow uae_rtc to be set without disabling uae_chipset_compatible.
+* Fixed flickering caused by undefined behavior in shift operations.
+* Added new option log_bsdsocket (boolean).
+
+Version 2.5.39dev:
+
+* Updated config for Logitech F310 and added Thrustmaster Dual Action 4.
+* Updated AROS kickstart replacement to ver. 2015-05-20 from WinUAE 3.1.0.
+* Config files must end with .fs-uae or .conf to be loaded by FS-UAE.
+* If you give fs-uae a command line argument with path to a .adf, it will
+  be used as value for floppy_drive_0.
+* Imported updated translations from crowdin.com.
+
 Version 2.5.38dev:
 
-* Several new and update joystick and gamepad configs.
+* Several new and updated joystick and gamepad configs.
 * Built-in configs for Xbox 360 / One pads on OS X (requires driver).
 * Changed default stereo separation setting to 70%.
 * Windows builds are digitally signed again.

ISSUES

@@ -1,3 +1,9 @@
-* When entering the GUI using modifier+F12, the modifier key(s) sticks in
-  the emulated Amiga when you return to the emulation.
-* Graphical flickering in Workbench with non-cycle-exact emulation.
+* Amiga key sticks when opening/closing FS-UAE menu with modifier+F12
+  https://github.com/FrodeSolheim/fs-uae/issues/77
+
+* FS-UAE freezes with black screen on Windows / nVIDIA?
+  https://github.com/FrodeSolheim/fs-uae/issues/75
+
+* Black screen when FS-UAE is started from FS-UAE Arcade?
+  https://github.com/FrodeSolheim/fs-uae/issues/76
+  https://github.com/FrodeSolheim/fs-uae-arcade/issues/6

Makefile.am

@@ -441,6 +441,7 @@ libuae_a_SOURCES = \
 	src/od-fs/machdep/ppc/maccess.h \
 	src/od-fs/machdep/rpt.h \
 	src/od-fs/machdep/x86/maccess.h \
+	src/od-fs/mman.cpp \
 	src/od-fs/mouse.cpp \
 	src/od-fs/mp3decoder.h \
 	src/od-fs/parser.cpp \
@@ -467,7 +468,6 @@ libuae_a_SOURCES = \
 	src/od-win32/debug_win32.h \
 	src/od-win32/dxwrap.h \
 	src/od-win32/md-fpp.h \
-	src/od-win32/mman.cpp \
 	src/od-win32/parser.h \
 	src/od-win32/picasso96_win.cpp \
 	src/od-win32/picasso96_win.h \
@@ -554,6 +554,7 @@ libfsemu_a_SOURCES = \
 	libfsemu/include/fs/data.h \
 	libfsemu/include/fs/defines.h \
 	libfsemu/include/fs/emu.h \
+	libfsemu/include/fs/emu/actions.h \
         libfsemu/include/fs/emu/audio.h \
         libfsemu/include/fs/emu/benchmark.h \
         libfsemu/include/fs/emu/buffer.h \
@@ -594,7 +595,6 @@ libfsemu_a_SOURCES = \
 	libfsemu/src/conf.c \
 	libfsemu/src/data.c \
 	libfsemu/src/emu/actions.c \
-	libfsemu/src/emu/actions.h \
 	libfsemu/src/emu/audio.h \
 	libfsemu/src/emu/audio_common.c \
 	libfsemu/src/emu/audio_debug.c \
@@ -1161,8 +1161,10 @@ EXTRA_DIST = $(TESTS) $(EXTRA_TESTS) \
 	src/inputevents.def \
 	src/jit/compemu_optimizer_x86.cpp \
 	src/jit/compemu_raw_x86.cpp \
+	src/jit/exception_handler.cpp \
 	src/od-fs/bsdsocket_posix.cpp \
 	src/od-win32/bsdsock.cpp \
+        src/od-win32/mman.cpp \
 	src/p96_blit.cpp \
 	src/sinctable.cpp \
 	src/table68k \

README

@@ -220,7 +220,7 @@ SUPPORTED HOST OPERATING SYSTEM
 ===============================
 - Linux
 - Windows XP or newer
-- Mac OS X 10.5 or newer
+- Mac OS X 10.6 or newer
 - FreeBSD (Other Unices will probably also work just fine)
 
 
@@ -256,7 +256,7 @@ in the floppy list, some may be obscured.
 
 COPYRIGHT AND CREDITS
 =====================
-FS-UAE is Copyright (c) 2011-2014, Frode Solheim
+FS-UAE is Copyright (c) 2011-2015, Frode Solheim
 Large portions are copyrighted by other individuals.
 
 FS-UAE is based on the fantastic work of the original UAE authors, the authors
@@ -270,12 +270,10 @@ contributors (see the UAE distribution for full credits).
 WinUAE has been developed and maintained by Mathias Ortmann and Toni Wilen.
 Toni Wilen has developed WinUAE for the last years and is the current
 maintainer. E-UAE was developed by Richard Drummond (no longer maintained),
-and P-UAE is developed by Mustafa "GnoStiC" TUFAN.
+and P-UAE is developed by Mustafa "GnoStiC" TUFAN (no longer maintained).
 
-http://www.amigaemulator.org/
 http://www.winuae.net/
 http://www.rcdrummond.net/uae/
-https://github.com/GnoStiC/PUAE
 http://www.softpres.org/
 
 libfsemu is Copyright (c) 2011-2013, Frode Solheim

configure.ac

@@ -150,8 +150,8 @@ PKG_CHECK_MODULES([OPENAL], [openal], [
         AS_CASE([$host_os],
 	[darwin*], [
 		AC_MSG_NOTICE([Using OpenAL.framework])
-		#OPENAL_CFLAGS="-I/System/Library/Frameworks/OpenAL.framework/Headers"
-		OPENAL_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenAL.framework/Headers"
+		OPENAL_CFLAGS="-I/System/Library/Frameworks/OpenAL.framework/Headers"
+		# OPENAL_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/OpenAL.framework/Headers"
 		OPENAL_LIBS="-framework OpenAL"
 
 	],
@@ -333,6 +333,8 @@ AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec])
 AC_CHECK_MEMBERS([struct stat.st_mtimespec.tv_nsec])
 AC_CHECK_MEMBERS([struct stat.st_mtime_nsec])
 AC_CHECK_MEMBERS([struct in_addr.S_un])
+AC_CHECK_MEMBERS([struct ucontext.uc_mcontext.gregs],
+	[], [], [[#include <sys/ucontext.h>]])
 
 AC_CHECK_TYPES([ptrdiff_t])
 AC_STRUCT_ST_BLOCKS
@@ -349,6 +351,7 @@ AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
+AC_CHECK_TYPES([__uint128_t])
 AC_TYPE_LONG_LONG_INT
 
 AC_CHECK_SIZEOF(int)

debian/changelog

@@ -2,4 +2,4 @@ fs-uae (2.6.0~beta2-0) unstable; urgency=low
 
   * Dummy changelog entry.
 
- -- Frode Solheim <[email protected]>  Sun,  9 Aug 2015 19:22:41 +0200
+ -- Frode Solheim <[email protected]>  Sun, 20 Sep 2015 21:52:53 +0200

doc/options/jit_compiler

@@ -0,0 +1 @@
+Type: Boolean

doc/options/jit_memory

@@ -0,0 +1,4 @@
+Type: Choice
+
+Value: direct
+Value: indirect

doc/options/log_autoscale

@@ -0,0 +1,7 @@
+Summary: Log Autoscale Changes
+Type: boolean
+Default: 0
+Example: 1
+
+This option will cause changes in autoscale coordinates to be logged to
+the log file *and* stdout.

doc/options/log_bsdsocket

@@ -0,0 +1,4 @@
+Summary:
+Type: boolean
+Default: 0
+Example: 1

doc/options/uae_gfx_linemode

@@ -2,23 +2,23 @@ Description: Controls how lines are doubled and interlaced modes are handled
 Example: double2
 Type: choice
 
-Value: none ("Single / Single")
+Value: none (Single / Single)
 
-Value: double ("Double / Double Frames")
-value: double2 ("Double / Double Fields")
-Value: double3 ("Double / Double Fields+")
+Value: double (Double / Double Frames)
+value: double2 (Double / Double Fields)
+Value: double3 (Double / Double Fields+)
 
-Value: scanlines ("Scanlines / Double Frames")
-Value: scanlines2 ("Scanlines / Double Fields")
-Value: scanlines3 ("Scanlines / Double Fields+")
+Value: scanlines (Scanlines / Double Frames)
+Value: scanlines2 (Scanlines / Double Fields)
+Value: scanlines3 (Scanlines / Double Fields+)
 
-Value: scanlines2p ("Double Fields / Double Frames")
-value: scanlines2p2 ("Double Fields / Double Fields")
-Value: scanlines2p3 ("Double Fields / Double Fields+")
+Value: scanlines2p (Double Fields / Double Frames)
+value: scanlines2p2 (Double Fields / Double Fields)
+Value: scanlines2p3 (Double Fields / Double Fields+)
 
-Value: scanlines3p ("Double Fields+ / Double Frames")
-Value: scanlines3p2 ("Double Fields+ / Double Fields")
-Value: scanlines3p3 ("Double Fields+ / Double Fields+")
+Value: scanlines3p (Double Fields+ / Double Frames)
+Value: scanlines3p2 (Double Fields+ / Double Fields)
+Value: scanlines3p3 (Double Fields+ / Double Fields+)
 
 Single:
 Non-interlaced lines are not doubled.

doc/options/uae_rtc

@@ -11,7 +11,7 @@ want to override this option, you may also have to set
 
 Value: auto ("Auto") - Automatically enable RTC module for some Amiga models.
 Value: none ("None") - Real time clock is explicitly disabled.
-Value: MSM6242B (Oki MSM6242B)- RTC module in A500/500+/600/1200/2000 models.
+Value: MSM6242B (Oki MSM6242B) - RTC module in A500/500+/600/1200/2000 models.
 Value: RP5C01A (Ricoh RP5C01A) - RTC module in big-box Amigas (A3000, A4000).
 Value: MSM6242B_A2000 (A2000 MSM6242B) - Only used in very early A2000
        revisions, not even WB 1.3 supports it.

libfsemu/README

@@ -1,4 +1,4 @@
-libfsemu is Copyright (c) 2011-2014, Frode Solheim, licensed under the
+libfsemu is Copyright (c) 2011-2015, Frode Solheim, licensed under the
 terms of the GNU Lesser General Public License (See COPYING).
 
 

libfsemu/include/fs/emu/actions.h

@@ -0,0 +1,12 @@
+#ifndef LIBFSEMU_ACTIONS_H
+#define LIBFSEMU_ACTIONS_H
+
+#define FS_EMU_ACTION_TAUNT      0xc001
+#define FS_EMU_ACTION_SCREENSHOT 0xc002
+#define FS_EMU_ACTION_PAUSE      0xc003
+#define FS_EMU_ACTION_MENU_ALT   0xc004
+
+void fs_emu_handle_libfsemu_action(int action, int state);
+
+#endif /* LIBFSEMU_ACTIONS_H */
+

libfsemu/include/fs/lazyness.h

@@ -3,4 +3,7 @@
 
 extern int g_fs_log_input;
 
+/* bsdsocket.h (uae) */
+extern int log_bsd;
+
 #endif /* FS_LAZYNESS_H */

libfsemu/src/emu/actions.c

@@ -21,14 +21,12 @@
 #endif
 
 #include <fs/emu.h>
+#include <fs/emu/actions.h>
+#include <fs/lazyness.h>
 #include <fs/glib.h>
-
-#include "actions.h"
 #include "video.h"
-
 #include <stdlib.h>
 
-
 static const char* g_taunts[] = {
         "You play like a dairy farmer!",
         "No one will ever catch ME playing as badly as you do!",
@@ -42,21 +40,28 @@ static const char* g_taunts[] = {
 };
 static int g_num_taunts = 8;
 
-static void taunt() {
+static void taunt()
+{
     char *text = g_strdup_printf("%c%s\n", 1,
             g_taunts[g_random_int_range(0, g_num_taunts)]);
     fs_emu_netplay_say(text);
     g_free(text);
 }
 
-void fs_emu_handle_libfsemu_action(int action, int state) {
-    printf("internal action %d %d\n", action, state);
+void fs_emu_handle_libfsemu_action(int action, int state)
+{
+    if (g_fs_log_input) {
+        fs_log("fs_emu_handle_libfsemu_action %d %d\n", action, state);
+    }
     if (state) {
-        if (action == FS_EMU_ACTION_TAUNT) {
+        if (action == FS_EMU_ACTION_MENU_ALT) {
+            fs_emu_menu_toggle();
+        } else if (action == FS_EMU_ACTION_TAUNT) {
             taunt();
-        }
-        else if (action == FS_EMU_ACTION_SCREENSHOT) {
+        } else if (action == FS_EMU_ACTION_SCREENSHOT) {
             g_fs_emu_screenshot = 1;
+        } else if (action == FS_EMU_ACTION_PAUSE) {
+            fs_emu_pause(!fs_emu_is_paused());
         }
     }
 }

libfsemu/src/emu/input.c

@@ -8,7 +8,6 @@
 #include <fs/emu/options.h>
 #include <fs/lazyness.h>
 #include "input.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,8 +16,7 @@
 #include <fs/inifile.h>
 #include <fs/glib.h>
 #include <fs/thread.h>
-
-#include "actions.h"
+#include <fs/emu/actions.h>
 #include "hud.h"
 #include "menu.h"
 #include "netplay.h"
@@ -627,13 +625,16 @@ void fs_emu_map_custom_actions() {
     map_custom_joystick_actions();
 }
 
-void fs_emu_set_actions(fs_emu_action *actions) {
+void fs_emu_set_actions(fs_emu_action *actions)
+{
     int k = 0;
 
     g_actions[k].name = "action_taunt";
     g_actions[k++].input_event = FS_EMU_ACTION_TAUNT;
     g_actions[k].name = "action_screenshot";
     g_actions[k++].input_event = FS_EMU_ACTION_SCREENSHOT;
+    g_actions[k].name = "action_pause";
+    g_actions[k++].input_event = FS_EMU_ACTION_PAUSE;
 
     while (actions->name) {
         if (k == MAX_ACTIONS) {

libfsemu/src/emu/menu.c

@@ -181,6 +181,9 @@ void fs_emu_menu_function(int action, int state) {
     else if (action == ACTION_MENU_BACK) {
         go_back_in_menu_stack();
     }
+    else if (action == ACTION_MENU_START) {
+        fs_emu_menu_toggle();
+    }
     else if (action == ACTION_MENU_ESCAPE) {
         if (!go_back_in_menu_stack()) {
             // no more menus to back out of, go out of menu mode instead
@@ -680,8 +683,9 @@ void fs_emu_menu_render(double transition) {
     glPopMatrix();
 }
 
-void fs_emu_menu_toggle() {
-    fs_emu_log("fs_emu_toggle_menu\n");
+void fs_emu_menu_toggle()
+{
+    fs_emu_log("fs_emu_menu_toggle\n");
     if (g_fs_emu_menu_mode) {
         // leave menu
         g_fs_emu_menu_mode = 0;