Skip to content

Commit e94d0bb

Browse files
authored
Merge branch 'master' into _494dd7682eb
2 parents 6a488b3 + c3c7733 commit e94d0bb

552 files changed

Lines changed: 178100 additions & 16448 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3rdparty/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# **3rdparty** #
22

3+
aescbc - [The MIT License (MIT)](http://opensource.org/licenses/MIT)
4+
35
asio - [Boost Software License](http://www.boost.org/LICENSE_1_0.txt)
46

57
asmjit - [zlib license](http://opensource.org/licenses/Zlib)

3rdparty/aes256cbc/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,4 +229,3 @@ Contributions and feedback are welcome! If you find issues or have ideas for imp
229229
## License
230230
231231
This standard AES-256 CBC implementation is provided under the [MIT License](./LICENSE).
232-

COPYING

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ Other Information
5555
the author or the affirmer.
5656

5757

58+
AES-256-CBC
59+
Copyright (c) 2024 Hallo Weeks
60+
5861
Asio C++ Library
5962
Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
6063

android-project/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
-->
55
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
66
package="org.mamedev.mame"
7-
android:versionCode="281"
8-
android:versionName="0.281"
7+
android:versionCode="282"
8+
android:versionName="0.282"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

docs/source/debugger/memory.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ By default, the data will be interpreted as a series of NUL-terminated
209209
(ASCIIZ) strings, the dump will have one string per line, and C-style
210210
escapes sequences will be used for bytes that do not represent printable
211211
ASCII characters. The optional **<term>** parameter can be used to
212-
specify a different string terminator character.
212+
specify a different string terminator character. If **<term>** equals
213+
-0x80, the terminator is not a separate byte but 0x80 added to the last
214+
character of each string.
215+
213216

214217
Back to :ref:`debugger-memory-list`
215218

docs/source/plugins/hiscore.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,3 @@ name corresponding the system short name (or ROM set name) with the extension
2626
file **mooncrst.hi** in the **hiscore** folder in your plugin data folder. The
2727
settings for the hiscore support plugin are stored in the file **plugin.cfg** in
2828
the **hiscore** folder in the plugin data folder (this file is in JSON format).
29-
30-
The hiscore support plugin can be disabled on a game-by-game basis by toggling the
31-
**Enable Hiscore Support for this game** option within the plugin's menu. By
32-
default, the plugin is enabled for all games. Games that have been excluded are
33-
tracked in a json file **exclude_games.json** that is stored in the
34-
**plugins/hiscore** folder.

docs/source/techspecs/uml_instructions.rst

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3502,6 +3502,94 @@ Simplification rules
35023502
* Immediate values for the ``count`` operand are truncated to five or
35033503
six bits for 32-bit or 64-bit operands, respectively.
35043504

3505+
.. _umlinst-bfx:
3506+
3507+
BFX
3508+
~~~
3509+
3510+
Extract a contiguous bit field from an integer value.
3511+
3512+
+---------------------------------+-----------------------------------------------+
3513+
| Disassembly | Usage |
3514+
+=================================+===============================================+
3515+
| .. code-block:: | .. code-block:: C++ |
3516+
| | |
3517+
| bfxu dst,src,shift,width | UML_BFXU(block, dst, src, shift, width); |
3518+
| bfxs dst,src,shift,width | UML_BFXS(block, dst, src, shift, width); |
3519+
| dbfxu dst,src,shift,width | UML_DBFXU(block, dst, src, shift, width); |
3520+
| dbfxs dst,src,shift,width | UML_DBFXS(block, dst, src, shift, width); |
3521+
+---------------------------------+-----------------------------------------------+
3522+
3523+
Extracts and right-aligns a contiguous bit field from the value of
3524+
``src``, specified by its least significant bit position and width in
3525+
bits. The field must be narrower than the ``src`` operand, but it may
3526+
wrap around from the most significant bit position to the least
3527+
significant bit position. BFXU and DBFXU zero-extend an unsigned field,
3528+
while BFXS and DBFXS sign-extend a signed field.
3529+
3530+
Back-ends may be able to optimise some forms of this instruction for
3531+
example when the ``shift`` and ``width`` operands are both immediate
3532+
values.
3533+
3534+
Operands
3535+
^^^^^^^^
3536+
3537+
dst (32-bit or 64-bit – memory, integer register)
3538+
The destination where the extracted field will be stored.
3539+
src (32-bit or 64-bit – memory, integer register, immediate, map variable)
3540+
The value to extract a contiguous bit field from.
3541+
shift (32-bit or 64-bit – memory, integer register, immediate, map variable)
3542+
The position of the least significant bit of the field to extract,
3543+
where zero is the least significant bit position, and bit numbers
3544+
increase toward the most significant bit position. Only the least
3545+
significant five bits or six bits of this operand are used,
3546+
depending on the instruction size.
3547+
width (32-bit or 64-bit – memory, integer register, immediate, map variable)
3548+
The width of the field to extract in bits. Only the least
3549+
significant five bits or six bits of this operand are used,
3550+
depending on the instruction size. The result is undefined if the
3551+
width modulo the instruction size in bits is zero.
3552+
3553+
Flags
3554+
^^^^^
3555+
3556+
carry (C)
3557+
Undefined.
3558+
overflow (V)
3559+
Undefined.
3560+
zero (Z)
3561+
Set if the result is zero, or cleared otherwise.
3562+
sign (S)
3563+
Set to the value of the most significant bit of the result (set if
3564+
the result is a negative signed integer value, or cleared
3565+
otherwise).
3566+
unordered (U)
3567+
Undefined.
3568+
3569+
Simplification rules
3570+
^^^^^^^^^^^^^^^^^^^^
3571+
3572+
* Converted to :ref:`MOV <umlinst-mov>`, :ref:`AND <umlinst-and>` or
3573+
:ref:`OR <umlinst-or>` if the ``src``, ``shift`` and ``width``
3574+
operands are all immediate values, or if the ``width`` operand is the
3575+
immediate value zero.
3576+
* Converted to :ref:`SHR <umlinst-shr>` or :ref:`SAR <umlinst-sar>` if
3577+
the ``src`` operand is not an immediate value, the ``shift`` and
3578+
``width`` operands are both immediate values, and the sum of the value
3579+
of the ``shift`` operand and the value of the ``width`` operand is
3580+
equal to the instruction size in bits.
3581+
* BFXU and DBFXU are converted to :ref:`AND <umlinst-and>` if the
3582+
``shift`` operand is the immediate value zero and ``width`` operand is
3583+
an immediate value.
3584+
* BFXS and DBFXS are converted to :ref:`SEXT <umlinst-sext>` if the
3585+
``shift`` operand is the immediate value zero and ``width`` operand is
3586+
the immediate value 8, 16 or 32.
3587+
* Immediate values for the ``src`` operand are truncated to the
3588+
instruction size.
3589+
* Immediate values for the ``shift`` and ``width`` operands are
3590+
truncated to five or six bits for 32-bit or 64-bit operands,
3591+
respectively.
3592+
35053593
.. _umlinst-roland:
35063594

35073595
ROLAND
@@ -3572,10 +3660,10 @@ Simplification rules
35723660
immediate value and the ``mask`` operand is an immediate value
35733661
containing a single contiguous left-aligned sequence of set bits of
35743662
the appropriate length for the value of the ``count`` operand.
3575-
* Converted to :ref:`SHR <umlinst-shr>` if the ``count`` operand is an
3576-
immediate value and the ``mask`` operand is an immediate value
3577-
containing a single contiguous right-aligned sequence of set bits of
3578-
the appropriate length for the value of the ``count`` operand.
3663+
* Converted to :ref:`SHR <umlinst-shr>` or :ref:`BFX <umlinst-bfx>` if
3664+
the ``count`` operand is an immediate value and the ``mask`` operand
3665+
is an immediate value containing a single contiguous right-aligned
3666+
sequence of set bits.
35793667
* Immediate values for the ``src`` and ``mask`` operands are truncated
35803668
to the instruction size.
35813669
* Immediate values for the ``count`` operand are truncated to five or

docs/source/usingmame/frontends.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ starting point.
2929
many useful features for home computer emulation. Written in C++, the
3030
`source code is on GitHub <https://github.com/npwoods/bletchmame>`__.
3131
`IV/Play <https://john-iv.github.io/iv-play/>`__ (Microsoft Windows)
32-
A fast, keyboard-driven, DirectX-accelerated launcher for MAME. IV/Play
33-
features a flexible filtering system, integrated browsing and launching
34-
for software lists, and a highly customizable interface. Written in C#.
32+
IV/Play has a customisable interface designed to be navigated with a
33+
keyboard. It supports software lists and has flexible filtering.
3534
`Emu Loader <http://emuloader.mameworld.info/>`__ (Microsoft Windows)
3635
Emu Loader provides a Windows interface for launching systems in multiple
3736
emulators, including MAME, Supermodel and DEMUL. Written in Delphi Pascal,

hash/apple2_flop_misc.xml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,90 @@ Generated by SLIST 0.2.1
185185
</part>
186186
</software>
187187

188+
<software name="dos31">
189+
<description>DOS 3.1 System Master</description>
190+
<year>1978</year>
191+
<publisher>Apple Computer, Inc.</publisher>
192+
<info name="usage" value="Requires Integer BASIC and a 13-sector bootloader" />
193+
<sharedfeat name="sl6_default" value="diskiing13" />
194+
195+
<part name="flop1" interface="floppy_5_25">
196+
<dataarea name="flop" size="116480">
197+
<rom name="Apple DOS 3.1 Master.d13" size="116480" crc="48774555" sha1="c81fdbfad674afaa0af89d851d301fd5c2430552" />
198+
</dataarea>
199+
</part>
200+
</software>
201+
202+
<software name="dos311" cloneof="dos31">
203+
<description>DOS 3.1.1 System Master</description>
204+
<year>1978</year>
205+
<publisher>Apple Computer, Inc.</publisher>
206+
<info name="usage" value="Requires Integer BASIC and a 13-sector bootloader" />
207+
<sharedfeat name="sl6_default" value="diskiing13" />
208+
209+
<part name="flop1" interface="floppy_5_25">
210+
<dataarea name="flop" size="116480">
211+
<rom name="Apple DOS 3.1.1 Master.d13" size="116480" crc="3b691817" sha1="fb24763efdd4b849933d4f0050cdd56c16ba5f24" />
212+
</dataarea>
213+
</part>
214+
</software>
215+
216+
<software name="dos32">
217+
<description>DOS 3.2 System Master (Standard Version)</description>
218+
<year>1979</year>
219+
<publisher>Apple Computer, Inc.</publisher>
220+
<info name="usage" value="Requires Integer BASIC and a 13-sector bootloader" />
221+
<sharedfeat name="sl6_default" value="diskiing13" />
222+
223+
<part name="flop1" interface="floppy_5_25">
224+
<dataarea name="flop" size="116480">
225+
<rom name="Apple DOS 3.2 Standard.d13" size="116480" crc="91061e1a" sha1="015ff2a99a5c6cca4d270304c8f709a6435610ed" />
226+
</dataarea>
227+
</part>
228+
</software>
229+
230+
<software name="dos321" cloneof="dos32">
231+
<description>DOS 3.2.1 System Master (Standard Version)</description>
232+
<year>1979</year>
233+
<publisher>Apple Computer, Inc.</publisher>
234+
<info name="usage" value="Requires Integer BASIC and a 13-sector bootloader" />
235+
<sharedfeat name="sl6_default" value="diskiing13" />
236+
237+
<part name="flop1" interface="floppy_5_25">
238+
<dataarea name="flop" size="116480">
239+
<rom name="Apple DOS 3.2 Standard.d13" size="116480" crc="e562e726" sha1="0c6ec7550f315543063467e1364f6cf1c9f59249" />
240+
</dataarea>
241+
</part>
242+
</software>
243+
244+
<software name="dos32p">
245+
<description>DOS 3.2 System Master (Plus Version)</description>
246+
<year>1979</year>
247+
<publisher>Apple Computer, Inc.</publisher>
248+
<info name="usage" value="Requires Applesoft BASIC and a 13-sector bootloader" />
249+
<sharedfeat name="sl6_default" value="diskiing13" />
250+
251+
<part name="flop1" interface="floppy_5_25">
252+
<dataarea name="flop" size="116480">
253+
<rom name="Apple DOS 3.2 Plus.d13" size="116480" crc="9fb90a9f" sha1="8c27781e876e803defdfe70974bcbd24c8329694" />
254+
</dataarea>
255+
</part>
256+
</software>
257+
258+
<software name="dos32ut">
259+
<description>DOS 3.2 Utility Disk</description>
260+
<year>1979</year>
261+
<publisher>Apple Computer, Inc.</publisher>
262+
<info name="usage" value="Requires Integer BASIC and a 13-sector bootloader" />
263+
<sharedfeat name="sl6_default" value="diskiing13" />
264+
265+
<part name="flop1" interface="floppy_5_25">
266+
<dataarea name="flop" size="116480">
267+
<rom name="Apple DOS 3.2 Utility.d13" size="116480" crc="6370f7dc" sha1="31473abf0fe6ffd2629450d132683f70661494eb" />
268+
</dataarea>
269+
</part>
270+
</software>
271+
188272
<software name="dos3380a">
189273
<description>DOS 3.3 System Master (1980, alternate)</description>
190274
<year>1980</year>

0 commit comments

Comments
 (0)