penguin86/z80-python-emulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from penguin86/master

Browse Source 
Ported to Python3
This commit is contained in:
Chris Burbridge 2022-05-25 22:35:16 +01:00 committed by GitHub
commit 312d0c5d96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
fuse_tests/tests.py
View File

@ -3,8 +3,8 @@ import copy
from time import sleep, time from time import sleep, time
import sys import sys
from PySide.QtCore import * from PySide2.QtCore import *
from PySide.QtGui import * from PySide2.QtGui import *
import threading import threading
import os import os
@ -32,7 +32,7 @@ class Z80Tester(io.Interruptable):
self.registers.IFF = False self.registers.IFF = False
self._interrupted = False self._interrupted = False
if self.registers.IM == 1: if self.registers.IM == 1:
print "!!! Interrupt !!!" print ("!!! Interrupt !!!")
ins, args = self.instructions << 0xCD ins, args = self.instructions << 0xCD
ins, args = self.instructions << 0x38 ins, args = self.instructions << 0x38
ins, args = self.instructions << 0x00 ins, args = self.instructions << 0x00
@ -55,7 +55,7 @@ class Z80Tester(io.Interruptable):
address = i & 0xFF address = i & 0xFF
#data[n] = self._iomap.address[address].read(address) #data[n] = self._iomap.address[address].read(address)
data[n] = self.registers.A data[n] = self.registers.A
print "Read IO ", print ("Read IO "),
raise Exception("Skip.") raise Exception("Skip.")
wrt = ins.execute(data, args) wrt = ins.execute(data, args)
for i in wrt: for i in wrt:
@ -65,14 +65,14 @@ class Z80Tester(io.Interruptable):
#iomap.address[address].write.emit(address, i[1]) #iomap.address[address].write.emit(address, i[1])
#self._iomap.address[address].write(address, i[1]) #self._iomap.address[address].write(address, i[1])
#print (chr(i[1])) #print (chr(i[1]))
print "Write IO ", print ("Write IO "),
raise Exception("Skip.") raise Exception("Skip.")
else: else:
try: try:
self._memory[i[0]] = i[1] self._memory[i[0]] = i[1]
except: except:
print i print (i)
print trace print (trace)
raise raise
return ins.tstates, trace return ins.tstates, trace
@ -131,9 +131,9 @@ if __name__ == '__main__':
base += 1 base += 1
print ": Test '%s' : "%(str(test_key)), print (": Test '%s' : "%(str(test_key))),
if test_key.startswith("27"): if test_key.startswith("27"):
print "SKIPPED" print ("SKIPPED")
continue continue
trace = "" trace = ""
taken= 0 taken= 0
@ -142,23 +142,23 @@ if __name__ == '__main__':
states, asm = mach.step_instruction() states, asm = mach.step_instruction()
taken += states taken += states
trace += "%d/%d\t%d\t" % (taken, tstates, states) + asm trace += "%d/%d\t%d\t" % (taken, tstates, states) + asm
except Exception, e: except Exception as e:
if e.message == "Can't decode instruction.": if e == "Can't decode instruction.":
print " - NO INSTRUCTION" print (" - NO INSTRUCTION")
mach.instructions.reset_composer() mach.instructions.reset_composer()
continue continue
elif e.message == "Skip.": elif e == "Skip.":
print "Skipped." print ("Skipped.")
mach.instructions.reset_composer() mach.instructions.reset_composer()
continue continue
else: else:
print "FAULTY" print ("FAULTY")
mach.instructions.reset_composer() mach.instructions.reset_composer()
raise raise
expected_lines = results.split('\n') expected_lines = results.split('\n')
if expected_lines[0] != test_key: if expected_lines[0] != test_key:
print "Test expectation mismatch" print ("Test expectation mismatch")
sys.exit(1) sys.exit(1)
i = 1 i = 1
while expected_lines[i].startswith(" "): while expected_lines[i].startswith(" "):
@ -203,14 +203,14 @@ if __name__ == '__main__':
#if mach.registers.R != regs2[1]: #if mach.registers.R != regs2[1]:
#raise Exception("Bad register") #raise Exception("Bad register")
if mach.registers.IFF != (regs2[2] == "1"): if mach.registers.IFF != (regs2[2] == "1"):
print "Bad interrups flag flop" print ("Bad interrups flag flop")
print regs2[2] print (regs2[2])
print mach.registers.IFF print (mach.registers.IFF)
raise Exception("Bad register") raise Exception("Bad register")
if mach.registers.IFF2 != (regs2[3] == "1"): if mach.registers.IFF2 != (regs2[3] == "1"):
print "Bad interrups flag flop" print ("Bad interrups flag flop")
print regs2[3] print (regs2[3])
print mach.registers.IFF2 print (mach.registers.IFF2)
raise Exception("Bad register") raise Exception("Bad register")
#if mach.registers.IFF2 != (regs2[3] == "1"): #if mach.registers.IFF2 != (regs2[3] == "1"):
#raise Exception("Bad register") #raise Exception("Bad register")
@ -233,35 +233,36 @@ if __name__ == '__main__':
if mach._memory[base] != int(val, 16): if mach._memory[base] != int(val, 16):
raise Exception("Memory mismatch") raise Exception("Memory mismatch")
base += 1 base += 1
except Exception, e: except Exception as e:
print "FAILED:",e.message print ("FAILED:",e.message)
fails += 1 fails += 1
continue continue
print "TRACE:" print ("TRACE:")
print trace print (trace)
print print ("")
flags = ["S", "Z", "F5", "H", "F3", "PV", "N", "C"] flags = ["S", "Z", "F5", "H", "F3", "PV", "N", "C"]
s = "" s = ""
for i, f in enumerate(flags): for i, f in enumerate(flags):
s += f+':' + str((regs[0] >> (7 - i)) & 0x01) + ' ' s += f+':' + str((regs[0] >> (7 - i)) & 0x01) + ' '
print "\nTarget flags: ", s print ("\nTarget flags: ", s)
s = "" s = ""
for i, f in enumerate(flags): for i, f in enumerate(flags):
s += f+':' + str((mach.registers.F >> (7 - i)) & 0x01) + ' ' s += f+':' + str((mach.registers.F >> (7 - i)) & 0x01) + ' '
print "Actual flags: ", s print ("Actual flags: ", s)
print print
print "--INITIAL--\n", t, "\n--TARGET--\n", results,"\n==--==\n" print ("--INITIAL--\n", t, "\n--TARGET--\n", results,"\n==--==\n")
regs = ['PC', 'SP', 'I', regs = ['PC', 'SP', 'I',
'A', 'F', 'B', 'C', 'A', 'F', 'B', 'C',
'D', 'E', 'H', 'L', 'D', 'E', 'H', 'L',
'IFF'] 'IFF']
regsr = ['IX', 'IY', 'R','A_', 'F_', 'B_', 'C_','D_', 'E_','H_', 'L_', 'IM'] regsr = ['IX', 'IY', 'R','A_', 'F_', 'B_', 'C_','D_', 'E_','H_', 'L_', 'IM']
print "Registers:" print ("Registers:")
for rl, rr in zip(regs, regsr): for rl, rr in zip(regs, regsr):
print rl, ": {0:X}".format( mach.registers[rl]), "\t\t", rr, ": {0:X}".format( mach.registers[rr]) print (rl, ": {0:X}".format( mach.registers[rl]), "\t\t", rr, ": {0:X}".format( mach.registers[rr]))
raise raise
print "PASSED" print ("PASSED")
passes += 1 passes += 1
print "Failed:", fails print ("Failed:", fails)
print "Passed:", passes print ("Passed:", passes)
print ("Passed:", passes)

13
src/z80/gui.py
View File

@ -1,10 +1,11 @@
import sys import sys
from PySide.QtCore import * from PySide2.QtCore import *
from PySide.QtGui import * from PySide2.QtGui import *
from PySide.QtWebKit import * from PySide2.QtWidgets import *
from PySide2.QtWebEngineWidgets import *
from cStringIO import StringIO from io import StringIO
class RegistersGUI(QWidget): class RegistersGUI(QWidget):
_addresses = [0x80, 0x81] _addresses = [0x80, 0x81]
@ -136,7 +137,7 @@ class RegistersGUI(QWidget):
vbox=QVBoxLayout() vbox=QVBoxLayout()
self.setLayout(vbox) self.setLayout(vbox)
self._view = QWebView() self._view = QWebEngineView(self)
vbox.addWidget(self._view) vbox.addWidget(self._view)
@ -179,7 +180,7 @@ class MemoryView(QWidget):
self._memory = memory self._memory = memory
self._registers = registers self._registers = registers
self._update_sgl.connect(self._update) self._update_sgl.connect(self._update)
self._web_view = QWebView() self._web_view = QWebEngineView(self)
vbox = QVBoxLayout() vbox = QVBoxLayout()
self.setLayout(vbox) self.setLayout(vbox)

12
src/z80/instructions.py
View File

@ -1,6 +1,6 @@
import copy import copy
import logging import logging
from util import * from . util import *
import sys import sys
class instruction(object): class instruction(object):
@ -63,9 +63,9 @@ class InstructionSet():
for i in dir(self): for i in dir(self):
f = getattr(self, i) f = getattr(self, i)
if f.__class__ == Instruction: if f.__class__ == Instruction:
print i, ":" print (i, ":")
for o in f.opcode_args: for o in f.opcode_args:
print o print (o)
ff = copy.copy(f) ff = copy.copy(f)
ff.registers = self._registers ff.registers = self._registers
ff.args = o[1] ff.args = o[1]
@ -86,7 +86,7 @@ class InstructionSet():
else: else:
opargs = ((o[0], ), o[1]) opargs = ((o[0], ), o[1])
for n, i in enumerate(opargs[0][:-1]): for n, i in enumerate(opargs[0][:-1]):
if d.has_key(i): if i in d:
d = d[i] d = d[i]
elif i == "-": elif i == "-":
ff.operands.append(n) ff.operands.append(n)
@ -120,7 +120,7 @@ class InstructionSet():
if self.is_two_parter(ins): if self.is_two_parter(ins):
return self._instructions[ins] return self._instructions[ins]
else: else:
if self._instructions[0].has_key(ins): if ins in self._instructions[0]:
return self._instructions[0][ins] return self._instructions[0][ins]
raise AttributeError("Unknown opcode") raise AttributeError("Unknown opcode")
@ -141,7 +141,7 @@ class InstructionSet():
self._instruction_composer = [] self._instruction_composer = []
def is_two_parter(self, ins): def is_two_parter(self, ins):
return self._instructions.has_key(ins) return ins in self._instructions
#---------------------------------------------------------------------- #----------------------------------------------------------------------

11
src/z80/io.py
View File

@ -1,7 +1,8 @@
import sys import sys
from PySide.QtCore import * from PySide2.QtCore import *
from PySide.QtGui import * from PySide2.QtGui import *
from PySide2.QtWidgets import *
class IO(object): class IO(object):
_addresses = [] _addresses = []
@ -12,7 +13,7 @@ class IO(object):
class Interruptable(object): class Interruptable(object):
def interrupt(self): def interrupt(self):
print "interrupt" print ("interrupt")
pass pass
class Console(QTextEdit, IO): class Console(QTextEdit, IO):
@ -35,7 +36,7 @@ class Console(QTextEdit, IO):
self._send_queue = None self._send_queue = None
def read(self, address): def read(self, address):
print "READ ", address print ("READ ", address)
if address == 0x80: if address == 0x80:
v = ((1 << 1) | # RTS v = ((1 << 1) | # RTS
((self._send_queue is not None) << 0) | # interrupt? ((self._send_queue is not None) << 0) | # interrupt?
@ -51,7 +52,7 @@ class Console(QTextEdit, IO):
@Slot(int, int) @Slot(int, int)
def write(self, address, value): def write(self, address, value):
print "------> WRITE ", address print ("------> WRITE ", address)
self._wrt_sgnl.emit(address, value) self._wrt_sgnl.emit(address, value)
def _write(self, address, value): def _write(self, address, value):

2
src/z80/registers.py
View File

@ -68,7 +68,7 @@ class Registers(dict):
self[attr] = val self[attr] = val
def __getattr__(self, reg): def __getattr__(self, reg):
if self.has_key(reg): if reg in self:
return self[reg] return self[reg]
elif reg in ["HL", "AF", "BC", "DE"]: elif reg in ["HL", "AF", "BC", "DE"]:
return self[reg[0]] << 8 | self[reg[1]] return self[reg[0]] << 8 | self[reg[1]]

4
src/z80/util.py
View File

@ -105,7 +105,7 @@ def add8(a, b, registers, S=True, Z=True, H=True,
def add16(a, b, registers): def add16(a, b, registers):
""" add a and b, return result and set flags """ """ add a and b, return result and set flags """
res = a + b res = a + b
print a, "+",b,"=",res print (a, "+",b,"=",res)
registers.condition.S = (res >> 15) & 0x01 registers.condition.S = (res >> 15) & 0x01
registers.condition.Z = (res == 0) registers.condition.Z = (res == 0)
if ((a & 0xFFF) + (b & 0xFFF)) > 0xFFF : if ((a & 0xFFF) + (b & 0xFFF)) > 0xFFF :
@ -126,7 +126,7 @@ def add16(a, b, registers):
def subtract16(a, b, registers): def subtract16(a, b, registers):
""" subtract b from a, return result and set flags """ """ subtract b from a, return result and set flags """
res = a - b res = a - b
print a, "-", b, "=", res, "(", hex(res), ")" print (a, "-", b, "=", res, "(", hex(res), ")")
registers.condition.S = (res >> 15) & 0x01 registers.condition.S = (res >> 15) & 0x01
registers.condition.N = 1 registers.condition.N = 1
registers.condition.Z = (res == 0) registers.condition.Z = (res == 0)

9
src/z80sbc.py
View File

@ -4,8 +4,9 @@ import copy
from time import sleep, time from time import sleep, time
import sys import sys
from PySide.QtCore import * from PySide2.QtCore import *
from PySide.QtGui import * from PySide2.QtGui import *
from PySide2.QtWidgets import *
import threading import threading
@ -58,7 +59,7 @@ class Z80SBC(io.Interruptable):
self.registers.IFF = False self.registers.IFF = False
self._interrupted = False self._interrupted = False
if self.registers.IM == 1: if self.registers.IM == 1:
print "!!! Interrupt !!!" print ("!!! Interrupt !!!")
ins, args = self.instructions << 0xCD ins, args = self.instructions << 0xCD
ins, args = self.instructions << 0x38 ins, args = self.instructions << 0x38
ins, args = self.instructions << 0x00 ins, args = self.instructions << 0x00
@ -102,7 +103,7 @@ if __name__ == '__main__':
while True: while True:
# t = time() # t = time()
ins, args = mach.step_instruction() ins, args = mach.step_instruction()
print ins.assembler(args) print (ins.assembler(args))
sleep(0.00000001) sleep(0.00000001)
# print (time() - t) / ins.tstates # print (time() - t) / ins.tstates