1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-09-27 15:11:27 -07:00

Revert "update for new readbyterange behaviour"

This reverts commit 71f44db82e.
This commit is contained in:
Connor Olding 2015-11-11 17:32:21 -08:00
parent 3342eb90d3
commit adab471173
2 changed files with 5 additions and 3 deletions

View file

@ -12,10 +12,12 @@ function Monitor:init(name, a)
end end
function Monitor:read() function Monitor:read()
local raw = mainmemory.readbyterange(self.begin, self.len) -- bizhawk has an off-by-one bug where this returns length + 1 bytes
local raw = mainmemory.readbyterange(self.begin, self.len-1)
local bytes = {} local bytes = {}
local begin = self.begin
for k, v in pairs(raw) do for k, v in pairs(raw) do
bytes[k] = v bytes[k - begin] = v
end end
return bytes return bytes
end end

View file

@ -43,7 +43,7 @@ function read_ascii(addr, len)
-- so we'll set up a table we can use ipairs() on -- so we'll set up a table we can use ipairs() on
local ordered_bytes = {} local ordered_bytes = {}
for a, v in pairs(bytes) do for a, v in pairs(bytes) do
ordered_bytes[tonumber(a, 16) + 1] = v ordered_bytes[tonumber(a, 16) - begin + 1] = v
end end
local seq = false local seq = false