Skip to content

Commit

Permalink
Merge tag 'mame0269' into HEAD
Browse files Browse the repository at this point in the history
MAME 0.269
  • Loading branch information
cuavas committed Aug 29, 2024
2 parents ed86b07 + 6d1970f commit 7c6133d
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 18 deletions.
4 changes: 2 additions & 2 deletions android-project/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="268"
android:versionName="0.268"
android:versionCode="269"
android:versionName="0.269"
android:installLocation="auto">

<!-- OpenGL ES 2.0 -->
Expand Down
22 changes: 19 additions & 3 deletions docs/source/commandline/commandline-all.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3677,8 +3677,9 @@ Debugging Options
Acts as a remote debugging server for the GNU debugger (GDB). Only a
small subset of the CPUs emulated by MAME are supported. Use the
:ref:`debugger_port <mame-commandline-debuggerport>` option to set the
listening port on the loopback interface. Supported on all platforms
with TCP socket support.
listening port and the
:ref:`debugger_host <mame-commandline-debuggerhost>` option to set the
address to bind to. Supported on all platforms with TCP socket support.
Example:
.. code-block:: bash
Expand Down Expand Up @@ -3732,11 +3733,26 @@ Debugging Options
mame ibm_5150 -watchdog 30
.. _mame-commandline-debuggerhost:
**-debugger_host** *<address>*
Set the IP address to listen on to accept GDB connections when using the
GDB stub debugger module (see the
:ref:`debugger <mame-commandline-debugger>` option).
The default is ``localhost``.
Example:
.. code-block:: bash
mame rfjet -debug -debugger gdbstub -debugger_host 0.0.0.0
.. _mame-commandline-debuggerport:
**-debugger_port** *<port>*
Set the TCP port number to listen on for GDB connections when using the GDB
Set the TCP port number to accept GDB connections on when using the GDB
stub debugger module (see the :ref:`debugger <mame-commandline-debugger>`
option).
Expand Down
1 change: 1 addition & 0 deletions docs/source/commandline/commandline-index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ Core Debugging Options
| :ref:`debugscript <mame-commandline-debugscript>`
| :ref:`[no]update_in_pause <mame-commandline-updateinpause>`
| :ref:`watchdog <mame-commandline-watchdog>`
| :ref:`debugger_host <mame-commandline-debuggerhost>`
| :ref:`debugger_port <mame-commandline-debuggerport>`
| :ref:`debugger_font <mame-commandline-debuggerfont>`
| :ref:`debugger_font_size <mame-commandline-debuggerfontsize>`
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
# built documents.
#
# The short X.Y version.
version = '0.268'
version = '0.269'
# The full version, including alpha/beta/rc tags.
release = '0.268'
release = '0.269'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion hash/leapfrog_leappad_cart.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ license:CC0-1.0
</software>

<software name="smartguid4" supported="no">
<description>FUN-damentals Series - Smart Guide to 4rd Grade (UK)</description>
<description>FUN-damentals Series - Smart Guide to 4th Grade (UK)</description>
<year>2002</year>
<publisher>LeapFrog</publisher>
<info name="serial" value="500-00534"/>
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1578,7 +1578,7 @@ endif

ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.268"' > $@
@echo '#define BARE_BUILD_VERSION "0.269"' > $@
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@
Expand All @@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo #define BARE_BUILD_VERSION "0.268" > $@
@echo #define BARE_BUILD_VERSION "0.269" > $@
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@
Expand Down
3 changes: 2 additions & 1 deletion src/frontend/mame/ui/menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "osdepend.h"

#include <cassert>
#include <cmath>
#include <cstdlib>
#include <limits>
#include <type_traits>
Expand Down Expand Up @@ -1930,7 +1931,7 @@ bool menu::check_metrics()
render_target &target(render.ui_target());
std::pair<uint32_t, uint32_t> const uisize(target.width(), target.height());
float const aspect = render.ui_aspect(&container());
if ((uisize == m_last_size) && (aspect == m_last_aspect))
if ((uisize == m_last_size) && (std::fabs(1.0F - (aspect / m_last_aspect)) < 1e-6F))
return false;

m_last_size = uisize;
Expand Down
12 changes: 6 additions & 6 deletions src/osd/modules/debugger/debuggdbstub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,8 @@ static const std::map<std::string, const gdb_register_map &> gdb_register_maps =
class debug_gdbstub : public osd_module, public debug_module
{
public:
debug_gdbstub()
: osd_module(OSD_DEBUG_PROVIDER, "gdbstub"), debug_module(),
debug_gdbstub() :
osd_module(OSD_DEBUG_PROVIDER, "gdbstub"), debug_module(),
m_readbuf_state(PACKET_START),
m_machine(nullptr),
m_maincpu(nullptr),
Expand All @@ -506,7 +506,7 @@ class debug_gdbstub : public osd_module, public debug_module
m_address_space(nullptr),
m_debugger_cpu(nullptr),
m_debugger_console(nullptr),
m_debugger_host(nullptr),
m_debugger_host(),
m_debugger_port(0),
m_socket(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE),
m_is_be(false),
Expand Down Expand Up @@ -601,7 +601,7 @@ class debug_gdbstub : public osd_module, public debug_module
address_space *m_address_space;
debugger_cpu *m_debugger_cpu;
debugger_console *m_debugger_console;
const char *m_debugger_host;
std::string m_debugger_host;
int m_debugger_port;
emu_file m_socket;
bool m_is_be;
Expand Down Expand Up @@ -795,8 +795,8 @@ void debug_gdbstub::wait_for_debugger(device_t &device, bool firststop)
std::string socket_name = string_format("socket.%s:%d", m_debugger_host, m_debugger_port);
std::error_condition const filerr = m_socket.open(socket_name);
if ( filerr )
fatalerror("gdbstub: failed to start listening on host %s port %d\n", m_debugger_host, m_debugger_port);
osd_printf_info("gdbstub: listening on host %s port %d\n", m_debugger_host, m_debugger_port);
fatalerror("gdbstub: failed to start listening on address %s port %d\n", m_debugger_host, m_debugger_port);
osd_printf_info("gdbstub: listening on address %s port %d\n", m_debugger_host, m_debugger_port);

m_initialized = true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/osd/modules/lib/osdobj_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const options_entry osd_options::s_option_entries[] =

{ nullptr, nullptr, core_options::option_type::HEADER, "OSD DEBUGGING OPTIONS" },
{ OSDOPTION_DEBUGGER, OSDOPTVAL_AUTO, core_options::option_type::STRING, "debugger used: " },
{ OSDOPTION_DEBUGGER_HOST, "localhost", core_options::option_type::STRING, "host to use for gdbstub debugger" },
{ OSDOPTION_DEBUGGER_HOST, "localhost", core_options::option_type::STRING, "address to bind to for gdbstub debugger" },
{ OSDOPTION_DEBUGGER_PORT, "23946", core_options::option_type::INTEGER, "port to use for gdbstub debugger" },
{ OSDOPTION_DEBUGGER_FONT ";dfont", OSDOPTVAL_AUTO, core_options::option_type::STRING, "font to use for debugger views" },
{ OSDOPTION_DEBUGGER_FONT_SIZE ";dfontsize", "0", core_options::option_type::FLOAT, "font size to use for debugger views" },
Expand Down

0 comments on commit 7c6133d

Please sign in to comment.