Skip to content

Commit df94102

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 78d2736 + bb92281 commit df94102

File tree

182 files changed

+11515
-7957
lines changed

Some content is hidden

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

182 files changed

+11515
-7957
lines changed

artwork/lut-default.png

-478 KB
Loading

docs/source/techspecs/device_memory_interface.rst

+8-5
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,17 @@ Indicates whether a given space actually exists.
152152

153153
.. code-block:: C++
154154

155-
bool translate(int spacenum, int intention, offs_t &address);
155+
bool translate(int spacenum, int intention, offs_t &address, address_space *&target_space);
156156
157157
Does a logical to physical address translation through the device's
158158
MMU. spacenum gives the space number, intention for the type of the
159-
future access (``TRANSLATE_(READ\|WRITE\|FETCH)(\|_USER\|_DEBUG)``)
160-
and address is an in/out parameter holding the address to translate on
161-
entry and the translated version on return. Should return ``true`` if
162-
the translation went correctly, or ``false`` if the address is unmapped.
159+
future access (``TR_(READ\|WRITE\|FETCH)``), address is an in/out
160+
parameter holding the address to translate on entry and the translated
161+
version on return, and finally target_space is the actual space the
162+
access would end up in, which may be in a different device. Should
163+
return ``true`` if the translation went correctly, or ``false`` if the
164+
address is unmapped. The call must not change the state of the
165+
device.
163166

164167
Note that for some historical reason, the device itself must override
165168
the virtual method ``memory_translate`` with the same signature.

hash/c64_cass.xml

+68-178
Large diffs are not rendered by default.

hash/ibm5150.xml

+714-53
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)