ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow exit too

This commit is contained in:
feos 2020-05-04 11:58:27 +03:00
parent 6f72012d6a
commit 82dcccf6cd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
View File

@ -483,6 +483,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
var size = (long)LibMAME.mame_lua_get_double(MAMELuaCommand.GetSpaceAddressMask) + 1; var size = (long)LibMAME.mame_lua_get_double(MAMELuaCommand.GetSpaceAddressMask) + 1;
var dataWidth = LibMAME.mame_lua_get_int(MAMELuaCommand.GetSpaceDataWidth) >> 3; // mame returns in bits var dataWidth = LibMAME.mame_lua_get_int(MAMELuaCommand.GetSpaceDataWidth) >> 3; // mame returns in bits
var endianString = MameGetString(MAMELuaCommand.GetSpaceEndianness); var endianString = MameGetString(MAMELuaCommand.GetSpaceEndianness);
//var addrSize = (size * 2).ToString();
MemoryDomain.Endian endian = MemoryDomain.Endian.Unknown; MemoryDomain.Endian endian = MemoryDomain.Endian.Unknown;
@ -502,11 +503,11 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
var read = MameGetString($"return { MAMELuaCommand.SpaceMap }[{ i }].readtype"); var read = MameGetString($"return { MAMELuaCommand.SpaceMap }[{ i }].readtype");
var write = MameGetString($"return { MAMELuaCommand.SpaceMap }[{ i }].writetype"); var write = MameGetString($"return { MAMELuaCommand.SpaceMap }[{ i }].writetype");
if (read == "ram" && write == "ram" /* || read == "rom" */) if (read == "ram" && write == "ram" || read == "rom")
{ {
var firstOffset = LibMAME.mame_lua_get_int($"return { MAMELuaCommand.SpaceMap }[{ i }].offset"); var firstOffset = LibMAME.mame_lua_get_int($"return { MAMELuaCommand.SpaceMap }[{ i }].offset");
var lastOffset = LibMAME.mame_lua_get_int($"return { MAMELuaCommand.SpaceMap }[{ i }].endoff"); var lastOffset = LibMAME.mame_lua_get_int($"return { MAMELuaCommand.SpaceMap }[{ i }].endoff");
var name = $"{ read.ToUpper() } { firstOffset:X}-{ lastOffset:X}"; var name = $"{ read.ToUpper() } ${ firstOffset:X} - ${ lastOffset:X}";
domains.Add(new MemoryDomainDelegate(name, lastOffset - firstOffset + 1, endian, domains.Add(new MemoryDomainDelegate(name, lastOffset - firstOffset + 1, endian,
delegate (long addr) delegate (long addr)
@ -665,7 +666,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
_mamePeriodicComplete.Set(); _mamePeriodicComplete.Set();
_memoryAccessComplete.WaitOne(); _memoryAccessComplete.WaitOne();
if (!_frameDone && !_paused) // FrameAdvance() has been requested if (!_frameDone && !_paused || _exiting) // FrameAdvance() has been requested
{ {
_memAccess = false; _memAccess = false;
return; return;