zzkt/orao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: improve address format

Browse source
This commit is contained in:
shokre 2023-10-21 05:09:36 +02:00
parent 8599f2966f
commit 04a34eaf44
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
orao/cpu.py
View file

@ -64,12 +64,13 @@ class CPU(object):
s.zy: lambda addr: "$%02X,y" % s.memory[addr], s.zy: lambda addr: "$%02X,y" % s.memory[addr],
s.ab: lambda addr: "$%04X" % (256 * s.memory[addr + 1] + s.memory[addr]), s.ab: lambda addr: "$%04X" % (256 * s.memory[addr + 1] + s.memory[addr]),
s.ax: lambda addr: "$%04X,x" % (256 * s.memory[addr + 1] + s.memory[addr]), s.ax: lambda addr: "$%04X,x" % (256 * s.memory[addr + 1] + s.memory[addr]),
s.ay: lambda addr: "$%04X,y" % (256 * s.memory[addr + 1] + s.memory[addr]),
s.no: lambda addr: "", s.no: lambda addr: "",
s.jm: lambda addr: "$%04X" % (256 * s.memory[addr + 1] + s.memory[addr]), s.jm: lambda addr: "$%04X" % (256 * s.memory[addr + 1] + s.memory[addr]),
s.id: lambda addr: "($%04X)" % (256 * s.memory[addr + 1] + s.memory[addr]), s.id: lambda addr: "($%04X)" % (256 * s.memory[addr + 1] + s.memory[addr]),
s.ix: lambda addr: "($%02X,x)" % s.memory[addr], s.ix: lambda addr: "($%02X,x)" % s.memory[addr],
s.iy: lambda addr: "($%02X),y" % s.memory[addr], s.iy: lambda addr: "($%02X),y" % s.memory[addr],
s.re: lambda addr: "$%04X" % (addr + s.memory[addr] + 1), s.re: lambda addr: "$%04X" % (addr + self.byte2signed(s.memory[addr]) + 1),
} }
def get_flag(self, flag): return self.flags & flag != 0 def get_flag(self, flag): return self.flags & flag != 0
@ -164,6 +165,10 @@ class CPU(object):
loc = self.zp() loc = self.zp()
addr = loc - 256 * (loc > 127) if loc & self.NEGATIVE else loc addr = loc - 256 * (loc > 127) if loc & self.NEGATIVE else loc
return (self.pc + addr) & 0xFFFF return (self.pc + addr) & 0xFFFF
def byte2signed(self, loc):
return loc - 256 * (loc > 127) if loc & self.NEGATIVE else loc
########################################################################### ###########################################################################
# Instrukcije # Instrukcije
def TAX(self, d): self.x = self.set_nz(self.a) def TAX(self, d): self.x = self.set_nz(self.a)