Update to 0.11-dev (2cbbaea)

.gitignore

@@ -20,6 +20,10 @@
 CMakeCache.txt
 CMakeFiles
 CMakeSettings.json
+CMakeUserPresets.json
+compile_commands.json
+/.cache
+/.vscode
 cmake_install.cmake
 hle-bios.bin
 version.c

CHANGES

@@ -1,30 +1,34 @@
 0.11.0: (Future)
 Features:
+ - New option to lock the maximum frame size
  - Scripting: New `input` API for getting raw keyboard/mouse/controller state
  - Scripting: New `storage` API for saving data for a script, e.g. settings
  - Scripting: Debugger integration to allow for breakpoints and watchpoints
  - New unlicensed GB mappers: NT (older types 1 and 2), Li Cheng, GGB-81
  - Debugger: Add range watchpoints
 Emulation fixes:
+ - GB Audio: Fix audio envelope timing resetting too often (fixes mgba.io/i/3164)
  - GB I/O: Fix STAT writing IRQ trigger conditions (fixes mgba.io/i/2501)
  - GB Serialize: Add missing Pocket Cam state to savestates
  - GB Video: Implement DMG-style sprite ordering
  - GBA: Unhandled bkpt should be treated as an undefined exception
- - GBA GPIO: Fix tilt scale and orientation (fixes mgba.io/i/2703)
+ - GBA GPIO: Fix gyro read-out start (fixes mgba.io/i/3141)
  - GBA I/O: Fix HALTCNT access behavior (fixes mgba.io/i/2309)
  - GBA SIO: Fix MULTI mode SIOCNT bit 7 writes on secondary GBAs (fixes mgba.io/i/3110)
  - GBA Video: Disable BG target 1 blending when OBJ blending (fixes mgba.io/i/2722)
 Other fixes:
  - Core: Fix inconsistencies with setting game-specific overrides (fixes mgba.io/i/2963)
  - Debugger: Fix writing to specific segment in command-line debugger
  - GB: Fix uninitialized save data when loading undersized temporary saves
+ - GBA Memory: Let raw access read high MMIO addresses
  - Qt: Fix savestate preview sizes with different scales (fixes mgba.io/i/2560)
  - Updater: Fix updating appimage across filesystems
 Misc:
  - Core: Handle relative paths for saves, screenshots, etc consistently (fixes mgba.io/i/2826)
  - GB: Prevent incompatible BIOSes from being used on differing models
  - GB Serialize: Add missing savestate support for MBC6 and NT (newer)
  - GBA: Improve detection of valid ELF ROMs
+ - GBA Audio: Remove broken XQ audio pending rewrite
  - mGUI: Enable auto-softpatching (closes mgba.io/i/2899)
  - mGUI: Persist fast forwarding after closing menu (fixes mgba.io/i/2414)
  - Qt: Handle multiple save game files for disparate games separately (fixes mgba.io/i/2887)

CMakeLists.txt

@@ -39,18 +39,18 @@ if(NOT MSVC)
 		# TODO: Remove this once mScript KV pairs support const correctness
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=incompatible-pointer-types")
 	endif()
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual -Werror=reorder")
 else()
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4003 /wd4244 /wd4146 /wd4267 /Zc:preprocessor-")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4003 /wd4244 /wd4146 /wd4267 /Zc:preprocessor-")
 endif()
 
 if(NOT LIBMGBA_ONLY)
-	set(USE_DEBUGGERS ON CACHE BOOL "Whether or not to enable the debugging infrastructure")
+	set(ENABLE_DEBUGGERS ON CACHE BOOL "Whether or not to enable the debugging infrastructure")
 	if (NOT WIN32)
 		set(USE_EDITLINE ON CACHE BOOL "Whether or not to enable the CLI-mode debugger")
 	endif()
-	set(USE_GDB_STUB ON CACHE BOOL "Whether or not to enable the GDB stub ARM debugger")
+	set(ENABLE_GDB_STUB ON CACHE BOOL "Whether or not to enable the GDB stub ARM debugger")
 	set(USE_FFMPEG ON CACHE BOOL "Whether or not to enable FFmpeg support")
 	set(USE_ZLIB ON CACHE BOOL "Whether or not to enable zlib support")
 	set(USE_MINIZIP ON CACHE BOOL "Whether or not to enable external minizip support")
@@ -68,9 +68,6 @@ if(NOT LIBMGBA_ONLY)
 	set(BUILD_QT ON CACHE BOOL "Build Qt frontend")
 	set(BUILD_SDL ON CACHE BOOL "Build SDL frontend")
 	set(BUILD_LIBRETRO OFF CACHE BOOL "Build libretro core")
-	if(APPLE)
-		set(BUILD_OPENEMU OFF CACHE BOOL "Build OpenEmu core")
-	endif()
 	set(BUILD_PERF OFF CACHE BOOL "Build performance profiling tool")
 	set(BUILD_TEST OFF CACHE BOOL "Build testing harness")
 	set(BUILD_SUITE OFF CACHE BOOL "Build test suite")
@@ -80,7 +77,7 @@ if(NOT LIBMGBA_ONLY)
 	set(BUILD_PYTHON OFF CACHE BOOL "Build Python bindings")
 	set(BUILD_STATIC OFF CACHE BOOL "Build a static library")
 	set(BUILD_SHARED ON CACHE BOOL "Build a shared library")
-	set(SKIP_LIBRARY OFF CACHE BOOL "Skip building the library (useful for only building libretro or OpenEmu cores)")
+	set(SKIP_LIBRARY OFF CACHE BOOL "Skip building the library (useful for only building libretro core)")
 	set(BUILD_GL ON CACHE BOOL "Build with OpenGL")
 	set(BUILD_GLES2 ON CACHE BOOL "Build with OpenGL|ES 2")
 	set(BUILD_GLES3 ON CACHE BOOL "Build with OpenGL|ES 3")
@@ -144,11 +141,6 @@ if (BUILD_LIBRETRO)
 	mark_as_advanced(LIBRETRO_LIBDIR)
 endif()
 
-if (BUILD_OPENEMU)
-	set(OE_LIBDIR "${LIBDIR}" CACHE PATH "Installed library directory (OpenEmu)")
-	mark_as_advanced(OE_LIBDIR)
-endif()
-
 if (DISTBUILD)
        set(EXTRA_LICENSES "" CACHE FILEPATH "Extra licenses to include in distribution packaages")
        mark_as_advanced(EXTRA_LICENSES)
@@ -217,13 +209,15 @@ endif()
 # Platform support
 if(WIN32)
 	set(WIN32_VERSION "${LIB_VERSION_MAJOR},${LIB_VERSION_MINOR},${LIB_VERSION_PATCH}")
-	add_definitions(-D_WIN32_WINNT=0x0600)
 	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 	if(MSVC)
 		add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 		add_definitions(-D_UNICODE -DUNICODE)
 	else()
 		add_definitions(-D_GNU_SOURCE)
+		if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+			add_compile_definitions(_FILE_OFFSET_BITS=64)
+		endif()
 	endif()
 	list(APPEND OS_LIB ws2_32 shlwapi)
 	list(APPEND CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-fd.c ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/windows/vfs-w32.c)
@@ -299,7 +293,7 @@ endif()
 
 if(DEFINED 3DS OR DEFINED PSP2 OR DEFINED WII OR DEFINED SWITCH)
 	set(IS_EMBEDDED ON)
-	set(USE_DEBUGGERS OFF)
+	set(ENABLE_DEBUGGERS OFF)
 	set(USE_SQLITE3 OFF)
 	set(USE_DISCORD_RPC OFF)
 	set(USE_LIBZIP OFF CACHE BOOL "")
@@ -311,12 +305,12 @@ if(DEFINED SWITCH)
 endif()
 
 if(NOT M_CORE_GBA)
-	set(USE_GDB_STUB OFF)
+	set(ENABLE_GDB_STUB OFF)
 endif()
 
-if(NOT USE_DEBUGGERS)
+if(NOT ENABLE_DEBUGGERS)
 	set(USE_EDITLINE OFF)
-	set(USE_GDB_STUB OFF)
+	set(ENABLE_GDB_STUB OFF)
 endif()
 
 if(WII)
@@ -343,18 +337,14 @@ find_function(popcount32)
 
 find_function(futimens)
 find_function(futimes)
+find_function(localtime_r)
 
 find_function(realpath)
 
 if(ANDROID AND ANDROID_NDK_MAJOR GREATER 13)
-	find_function(localtime_r)
-	set(HAVE_STRTOF_L ON)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-	find_function(localtime_r)
+	list(APPEND FUNCTION_DEFINES HAVE_STRTOF_L)
+elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	# The strtof_l on Linux not actually exposed nor actually strtof_l
-	set(HAVE_STRTOF_L OFF)
-else()
-	find_function(localtime_r)
 	find_function(strtof_l)
 endif()
 
@@ -491,7 +481,7 @@ if(NOT BUILD_GLES2 AND NOT BUILD_GLES3 AND NOT LIBMGBA_ONLY)
 endif()
 
 if(DISABLE_DEPS)
-	set(USE_GDB_STUB OFF)
+	set(ENABLE_GDB_STUB OFF)
 	set(USE_DISCORD_RPC OFF)
 	set(USE_JSON_C OFF)
 	set(USE_SQLITE3 OFF)
@@ -543,8 +533,8 @@ else()
 	set(DEBUGGER_LIB "")
 endif()
 
-if(USE_GDB_STUB)
-	list(APPEND FEATURES GDB_STUB)
+if(ENABLE_GDB_STUB)
+	list(APPEND ENABLES GDB_STUB)
 endif()
 source_group("Debugger" FILES ${DEBUGGER_SRC})
 
@@ -588,8 +578,6 @@ if(USE_FFMPEG)
 	endif()
 endif()
 
-list(APPEND THIRD_PARTY_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/blip_buf/blip_buf.c")
-
 if(WANT_ZLIB AND NOT USE_ZLIB)
 	set(SKIP_INSTALL_ALL ON)
 	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/zlib zlib EXCLUDE_FROM_ALL)
@@ -853,10 +841,10 @@ if(M_CORE_GBA)
 	list(APPEND TEST_SRC ${ARM_TEST_SRC} ${GBA_TEST_SRC})
 endif()
 
-if(USE_DEBUGGERS)
+if(ENABLE_DEBUGGERS)
 	list(APPEND FEATURE_SRC ${DEBUGGER_SRC})
 	list(APPEND TEST_SRC ${DEBUGGER_TEST_SRC})
-	list(APPEND FEATURES DEBUGGERS)
+	list(APPEND ENABLES DEBUGGERS)
 endif()
 
 if(ENABLE_SCRIPTING)
@@ -1005,22 +993,6 @@ if(BUILD_LIBRETRO)
 	endif()
 endif()
 
-if(BUILD_OPENEMU)
-	find_library(FOUNDATION Foundation)
-	find_library(OPENEMUBASE OpenEmuBase)
-	file(GLOB OE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/openemu/*.m)
-	add_library(${BINARY_NAME}-openemu MODULE ${CORE_SRC} ${OS_SRC})
-	set_target_properties(${BINARY_NAME}-openemu PROPERTIES
-		MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/openemu/Info.plist.in
-		BUNDLE TRUE
-		BUNDLE_EXTENSION oecoreplugin
-		OUTPUT_NAME ${PROJECT_NAME}
-		COMPILE_OPTIONS "-fobjc-arc"
-		COMPILE_DEFINITIONS "DISABLE_THREADING;MGBA_STANDALONE;${OS_DEFINES};${FUNCTION_DEFINES};MINIMAL_CORE=1")
-	target_link_libraries(${BINARY_NAME}-openemu ${OS_LIB} ${FOUNDATION} ${OPENEMUBASE})
-	install(TARGETS ${BINARY_NAME}-openemu LIBRARY DESTINATION ${OE_LIBDIR} COMPONENT ${BINARY_NAME}.oecoreplugin NAMELINK_SKIP)
-endif()
-
 if(BUILD_QT AND (WIN32 OR APPLE OR CMAKE_SYSTEM_NAME STREQUAL "Linux"))
 	set(BUILD_UPDATER ON)
 endif()
@@ -1087,7 +1059,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/mgba-util DESTINATION ${CM
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/mgba/flags.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mgba COMPONENT ${BINARY_NAME}-dev)
 
 # Packaging
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/licenses/blip_buf.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}/licenses COMPONENT ${BINARY_NAME})
+install(FILES DESTINATION ${CMAKE_INSTALL_DOCDIR}/licenses COMPONENT ${BINARY_NAME})
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/licenses/inih.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}/licenses COMPONENT ${BINARY_NAME})
 if(USE_DISCORD_RPC)
 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/licenses/discord-rpc.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}/licenses COMPONENT ${BINARY_NAME})
@@ -1314,11 +1286,11 @@ if(NOT QUIET AND NOT LIBMGBA_ONLY)
 	message(STATUS "	Game Boy Advance: ${M_CORE_GBA}")
 	message(STATUS "	Game Boy: ${M_CORE_GB}")
 	message(STATUS "Features:")
-	message(STATUS "	Debuggers: ${USE_DEBUGGERS}")
+	message(STATUS "	Debuggers: ${ENABLE_DEBUGGERS}")
 	if(NOT WIN32)
 		message(STATUS "	CLI debugger: ${USE_EDITLINE}")
 	endif()
-	message(STATUS "	GDB stub: ${USE_GDB_STUB}")
+	message(STATUS "	GDB stub: ${ENABLE_GDB_STUB}")
 	message(STATUS "	GIF/Video recording: ${USE_FFMPEG}")
 	message(STATUS "	Screenshot/advanced savestate support: ${USE_PNG}")
 	message(STATUS "	ZIP support: ${SUMMARY_ZIP}")
@@ -1349,9 +1321,6 @@ if(NOT QUIET AND NOT LIBMGBA_ONLY)
 	message(STATUS "	ROM tester: ${BUILD_ROM_TEST}")
 	message(STATUS "Cores:")
 	message(STATUS "	Libretro core: ${BUILD_LIBRETRO}")
-	if(APPLE)
-		message(STATUS "	OpenEmu core: ${BUILD_OPENEMU}")
-	endif()
 	message(STATUS "Libraries:")
 	message(STATUS "	Static: ${BUILD_STATIC}")
 	message(STATUS "	Shared: ${BUILD_SHARED}")

CMakePresets.json

@@ -0,0 +1,21 @@
+{
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "clang",
+            "generator": "Ninja",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "gcc",
+            "generator": "Ninja",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        }
+    ]
+}

README.md

@@ -260,7 +260,6 @@ mGBA is Copyright © 2013 – 2023 Jeffrey Pfau. It is distributed under the [Mo
 mGBA contains the following third-party libraries:
 
 - [inih](https://github.com/benhoyt/inih), which is copyright © 2009 – 2020 Ben Hoyt and used under a BSD 3-clause license.
-- [blip-buf](https://code.google.com/archive/p/blip-buf), which is copyright © 2003 – 2009 Shay Green and used under a Lesser GNU Public License.
 - [LZMA SDK](http://www.7-zip.org/sdk.html), which is public domain.
 - [MurmurHash3](https://github.com/aappleby/smhasher) implementation by Austin Appleby, which is public domain.
 - [getopt for MSVC](https://github.com/skandhurkat/Getopt-for-Visual-Studio/), which is public domain.

README_DE.md

@@ -247,7 +247,6 @@ Copyright für mGBA © 2013 – 2021 Jeffrey Pfau. mGBA wird unter der [Mozilla
 mGBA beinhaltet die folgenden Bibliotheken von Drittanbietern:
 
 - [inih](https://github.com/benhoyt/inih), Copyright © 2009 - 2020 Ben Hoyt, verwendet unter einer BSD 3-clause-Lizenz.
-- [blip-buf](https://code.google.com/archive/b/blip-buf), Copyright © 2003 - 2009 Shay Green, verwendet unter einer Lesser GNU Public License.
 - [LZMA SDK](http://www.7-zip.org/sdk.html), Public Domain.
 - [MurmurHash3](https://github.com/aappleby/smhasher), Implementierung von Austin Appleby, Public Domain.
 - [getopt fot MSVC](https://github.com/skandhurkat/Getopt-for-Visual-Studio/), Public Domain.

README_ES.md

@@ -247,7 +247,6 @@ mGBA es Copyright © 2013 – 2021 Jeffrey Pfau. Es distribuído bajo la [licenc
 mGBA contiene las siguientes bibliotecas de terceros:
 
 - [inih](https://github.com/benhoyt/inih), que es copyright © 2009 - 2020 Ben Hoyt y se utiliza bajo licencia de la cláusula 3 de BSD.
-- [blip-buf](https://code.google.com/archive/p/blip-buf), que es  copyright © 2003 - 2009 Shay Green y se usa bajo LGPL.
 - [LZMA SDK](http://www.7-zip.org/sdk.html), la cual está en el dominio público.
 - [MurmurHash3](https://github.com/aappleby/smhasher), implementación por Austin Appleby, la cual está en el dominio público.
 - [getopt for MSVC](https://github.com/skandhurkat/Getopt-for-Visual-Studio/), la cual está en el dominio público.

README_ZH_CN.md

@@ -245,7 +245,6 @@ mGBA 版权 © 2013 – 2020 Jeffrey Pfau。基于 [Mozilla 公共许可证版
 mGBA 包含以下第三方库：
 
 - [inih](https://github.com/benhoyt/inih)：版权 © 2009 – 2020 Ben Hoyt，基于 BSD 3-clause 许可证使用。
-- [blip-buf](https://code.google.com/archive/p/blip-buf)：版权 © 2003 – 2009 Shay Green，基于 Lesser GNU 公共许可证使用。
 - [LZMA SDK](http://www.7-zip.org/sdk.html)：属公有领域使用。
 - [MurmurHash3](https://github.com/aappleby/smhasher)：由 Austin Appleby 实施，属公有领域使用。
 - [getopt for MSVC](https://github.com/skandhurkat/Getopt-for-Visual-Studio/)：属公有领域使用。

include/mgba-util/audio-buffer.h

@@ -0,0 +1,34 @@
+/* Copyright (c) 2013-2024 Jeffrey Pfau
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef M_AUDIO_BUFFER_H
+#define M_AUDIO_BUFFER_H
+
+#include <mgba-util/common.h>
+
+CXX_GUARD_START
+
+#include <mgba-util/circle-buffer.h>
+
+struct mAudioBuffer {
+	struct mCircleBuffer data;
+	unsigned channels;
+};
+
+void mAudioBufferInit(struct mAudioBuffer* buffer, size_t capacity, unsigned channels);
+void mAudioBufferDeinit(struct mAudioBuffer* buffer);
+
+size_t mAudioBufferAvailable(const struct mAudioBuffer* buffer);
+size_t mAudioBufferCapacity(const struct mAudioBuffer* buffer);
+
+void mAudioBufferClear(struct mAudioBuffer* buffer);
+int16_t mAudioBufferPeek(const struct mAudioBuffer* buffer, unsigned channel, size_t offset);
+size_t mAudioBufferDump(const struct mAudioBuffer* buffer, int16_t* samples, size_t count, size_t offset);
+size_t mAudioBufferRead(struct mAudioBuffer* buffer, int16_t* samples, size_t count);
+size_t mAudioBufferWrite(struct mAudioBuffer* buffer, const int16_t* samples, size_t count);
+
+CXX_GUARD_END
+
+#endif

include/mgba-util/audio-resampler.h

@@ -0,0 +1,42 @@
+/* Copyright (c) 2013-2024 Jeffrey Pfau
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef M_AUDIO_RESAMPLER_H
+#define M_AUDIO_RESAMPLER_H
+
+#include <mgba-util/common.h>
+
+CXX_GUARD_START
+
+#include <mgba-util/interpolator.h>
+
+struct mAudioBuffer;
+struct mAudioResampler {
+	struct mAudioBuffer* source;
+	struct mAudioBuffer* destination;
+	double sourceRate;
+	double destRate;
+	double timestamp;
+	double lowWaterMark;
+	double highWaterMark;
+	enum mInterpolatorType interpType;
+	union {
+		struct mInterpolator interp;
+		struct mInterpolatorSinc sinc;
+		struct mInterpolatorCosine cosine;
+	};
+	bool consume;
+};
+
+void mAudioResamplerInit(struct mAudioResampler*, enum mInterpolatorType);
+void mAudioResamplerDeinit(struct mAudioResampler*);
+void mAudioResamplerSetSource(struct mAudioResampler*, struct mAudioBuffer* source, double rate, bool consume);
+void mAudioResamplerSetDestination(struct mAudioResampler*, struct mAudioBuffer* destination, double rate);
+size_t mAudioResamplerProcess(struct mAudioResampler*);
+
+CXX_GUARD_END
+
+#endif
+