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

Fix #2844 properly, and do writebyterange as well 

effectively reverts d784e9c00 and 38442bd5f
This commit is contained in:
YoshiRulz 2021-08-03 01:36:12 +10:00
parent b6e91aef32
commit 7068fd2c39
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 67 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/BizHawk.Client.Common/lua/CommonLibs/MemoryLuaLibrary.cs
View File

@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
using System.Linq;
using NLua;
@ -46,24 +47,26 @@ namespace BizHawk.Client.Common
[LuaMethod("writebyte", "Writes the given value to the given address as an unsigned byte")]
public void WriteByte(long addr, uint value, string domain = null) => APIs.Memory.WriteByte(addr, value, domain);
[LuaMethodExample("local nlmemrea = memory.readbyterange( 0x100, 30, mainmemory.getname( ) );")]
[LuaDeprecatedMethod]
[LuaMethod("readbyterange", "Reads the address range that starts from address, and is length long. Returns a zero-indexed table containing the read values (an array of bytes.)")]
public LuaTable ReadByteRange(long addr, int length, string domain = null) => _th.ListToTable(APIs.Memory.ReadByteRange(addr, length, domain));
[LuaMethodExample("local nlmemrea = memory.readbyterangetable( 0x100, 30, 0x100, mainmemory.getname( ) );")]
[LuaMethod("readbyterangetable", "Reads the address range that starts from address, and is length long. Returns the result into a table of key value pairs (where the index is the first key.)")]
public LuaTable ReadByteRangeTable(long addr, int length, long index, string domain = null) => _th.ListToTable(APIs.Memory.ReadByteRange(addr, length, domain), index);
[LuaMethodExample("local bytes = memory.read_bytes_as_array(0x100, 30, \"WRAM\");")]
[LuaMethod("read_bytes_as_array", "Reads length bytes starting at addr into an array-like table (1-indexed).")]
public LuaTable ReadBytesAsArray(long addr, int length, string domain = null)
=> _th.ListToTable(APIs.Memory.ReadByteRange(addr, length, domain), indexFrom: 1);
/// <remarks>TODO C# version requires a contiguous address range</remarks>
[LuaMethodExample("")]
[LuaMethodExample("local bytes = memory.read_bytes_as_dict(0x100, 30, \"WRAM\");")]
[LuaMethod("read_bytes_as_dict", "Reads length bytes starting at addr into a dict-like table (where the keys are the addresses, relative to the start of the domain).")]
public LuaTable ReadBytesAsDict(long addr, int length, string domain = null)
=> _th.MemoryBlockToTable(APIs.Memory.ReadByteRange(addr, length, domain), addr);
[LuaDeprecatedMethod]
[LuaMethod("writebyterange", "Writes the given values to the given addresses as unsigned bytes")]
public void WriteByteRange(LuaTable memoryblock, string domain = null)
{
#if true
foreach (var (addr, v) in _th.EnumerateEntries<double, double>(memoryblock))
{
APIs.Memory.WriteByte(LuaInt(addr), (uint) v, domain);
}
WriteBytesAsDict(memoryblock, domain);
#else
var d = string.IsNullOrEmpty(domain) ? Domain : DomainList[VerifyMemoryDomain(domain)];
if (d.CanPoke())
@ -88,6 +91,21 @@ namespace BizHawk.Client.Common
#endif
}
[LuaMethodExample("memory.write_bytes_as_array(0x100, { 0xAB, 0x12, 0xCD, 0x34 });")]
[LuaMethod("write_bytes_as_array", "Writes sequential bytes starting at addr.")]
public void WriteBytesAsArray(long addr, LuaTable bytes, string domain = null)
=> APIs.Memory.WriteByteRange(addr, _th.EnumerateValues<double>(bytes).Select(d => (byte) d).ToList(), domain);
[LuaMethodExample("memory.write_bytes_as_dict({ [0x100] = 0xAB, [0x104] = 0xCD, [0x106] = 0x12, [0x107] = 0x34, [0x108] = 0xEF });")]
[LuaMethod("write_bytes_as_dict", "Writes bytes at arbitrary addresses (the keys of the given table are the addresses, relative to the start of the domain).")]
public void WriteBytesAsDict(LuaTable addrMap, string domain = null)
{
foreach (var (addr, v) in _th.EnumerateEntries<double, double>(addrMap))
{
APIs.Memory.WriteByte(LuaInt(addr), (uint) v, domain);
}
}
[LuaMethodExample("local simemrea = memory.readfloat( 0x100, false, mainmemory.getname( ) );")]
[LuaMethod("readfloat", "Reads the given address as a 32-bit float value from the main memory domain with th e given endian")]
public float ReadFloat(long addr, bool bigendian, string domain = null)

38
src/BizHawk.Client.Common/lua/LuaHelperLibs/MainMemoryLuaLibrary.cs
View File

@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
using System.Linq;
using BizHawk.Emulation.Common;
@ -43,24 +44,26 @@ namespace BizHawk.Client.Common
[LuaMethod("writebyte", "Writes the given value to the given address as an unsigned byte")]
public void WriteByte(long addr, uint value) => APIs.Memory.WriteByte(addr, value, MainMemName);
[LuaMethodExample("local nlmairea = mainmemory.readbyterange( 0x100, 64 );")]
[LuaDeprecatedMethod]
[LuaMethod("readbyterange", "Reads the address range that starts from address, and is length long. Returns a zero-indexed table containing the read values (an array of bytes.)")]
public LuaTable ReadByteRange(long addr, int length) => _th.ListToTable(APIs.Memory.ReadByteRange(addr, length, MainMemName));
[LuaMethodExample("local nlmairea = mainmemory.readbyterangetable( 0x100, 64, 0x100 );")]
[LuaMethod("readbyterangetable", "Reads the address range that starts from address, and is length long. Returns the result into a table of key value pairs (where the index is the first key.)")]
public LuaTable ReadByteRangeTable(long addr, int length, long index) => _th.ListToTable(APIs.Memory.ReadByteRange(addr, length), index);
[LuaMethodExample("local bytes = mainmemory.read_bytes_as_array(0x100, 30);")]
[LuaMethod("read_bytes_as_array", "Reads length bytes starting at addr into an array-like table (1-indexed).")]
public LuaTable ReadBytesAsArray(long addr, int length)
=> _th.ListToTable(APIs.Memory.ReadByteRange(addr, length, MainMemName), indexFrom: 1);
/// <remarks>TODO C# version requires a contiguous address range</remarks>
[LuaMethodExample("")]
[LuaMethodExample("local bytes = mainmemory.read_bytes_as_dict(0x100, 30);")]
[LuaMethod("read_bytes_as_dict", "Reads length bytes starting at addr into a dict-like table (where the keys are the addresses, relative to the start of the main memory).")]
public LuaTable ReadBytesAsDict(long addr, int length)
=> _th.MemoryBlockToTable(APIs.Memory.ReadByteRange(addr, length, MainMemName), addr);
[LuaDeprecatedMethod]
[LuaMethod("writebyterange", "Writes the given values to the given addresses as unsigned bytes")]
public void WriteByteRange(LuaTable memoryblock)
{
#if true
foreach (var (addr, v) in _th.EnumerateEntries<double, double>(memoryblock))
{
APIs.Memory.WriteByte(LuaInt(addr), (uint) v, MainMemName);
}
WriteBytesAsDict(memoryblock);
#else
var d = Domain;
if (d.CanPoke())
@ -85,6 +88,21 @@ namespace BizHawk.Client.Common
#endif
}
[LuaMethodExample("mainmemory.write_bytes_as_array(0x100, { 0xAB, 0x12, 0xCD, 0x34 });")]
[LuaMethod("write_bytes_as_array", "Writes sequential bytes starting at addr.")]
public void WriteBytesAsArray(long addr, LuaTable bytes)
=> APIs.Memory.WriteByteRange(addr, _th.EnumerateValues<double>(bytes).Select(d => (byte) d).ToList(), MainMemName);
[LuaMethodExample("mainmemory.write_bytes_as_dict({ [0x100] = 0xAB, [0x104] = 0xCD, [0x106] = 0x12, [0x107] = 0x34, [0x108] = 0xEF });")]
[LuaMethod("write_bytes_as_dict", "Writes bytes at arbitrary addresses (the keys of the given table are the addresses, relative to the start of the main memory).")]
public void WriteBytesAsDict(LuaTable addrMap)
{
foreach (var (addr, v) in _th.EnumerateEntries<double, double>(addrMap))
{
APIs.Memory.WriteByte(LuaInt(addr), (uint) v, MainMemName);
}
}
[LuaMethodExample("local simairea = mainmemory.readfloat(0x100, false);")]
[LuaMethod("readfloat", "Reads the given address as a 32-bit float value from the main memory domain with th e given endian")]
public float ReadFloat(long addr, bool bigendian)

12
src/BizHawk.Client.Common/lua/NLuaTableHelper.cs
View File

@ -39,13 +39,23 @@ namespace BizHawk.Client.Common
public IEnumerable<T> EnumerateValues<T>(LuaTable table) => table.Values.Cast<T>();
public LuaTable ListToTable<T>(IList<T> list, long indexFrom = 0)
public LuaTable ListToTable<T>(IList<T> list, int indexFrom = 0)
{
var table = _lua.NewTable();
for (int i = 0, l = list.Count; i != l; i++) table[indexFrom + i] = list[i];
return table;
}
public LuaTable MemoryBlockToTable(IReadOnlyList<byte> bytes, long startAddr)
{
var length = bytes.Count;
var table = CreateTable();
var iArray = 0;
var iDict = startAddr;
while (iArray < length) table[(double) iDict++] = bytes[iArray++];
return table;
}
public LuaTable ObjectToTable(object obj)
{
var table = _lua.NewTable();