github.com/rzzzwilson.pymlac
1
0
Fork 0
mirror of https://github.com/rzzzwilson/pymlac.git synced 2025-06-10 09:32:41 +00:00
Code Issues Releases Wiki Activity

Fiddling with recognizing formats - no progress

Browse Source
This commit is contained in:
Ross Wilson
2016-03-07 21:31:16 +07:00
parent e6c145f1d6
commit 65610ee486
5 changed files with 141 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
idasm/idasm
View File

@@ -19,6 +19,7 @@ import processmain
import processdisplay
import processdata
import mem
import loadptp
PROGRAMNAME = "idasm"
@@ -28,7 +29,7 @@ objwildcard = "Papertape files (*.ptp)|*.ptp|All files (*.*)|*.*"
projwildcard = "Project files (*.idasm)|*.idasm|All files (*.*)|*.*"
grid = None
mem = None
Mem = None
frame = None
projectName = ""
@@ -48,7 +49,7 @@ def newCycleNumber():
yield cycle
newcycle = newCycleNumber()
NewCycle = newCycleNumber()
def loadProject(filename):
@@ -59,31 +60,31 @@ def loadProject(filename):
def saveProject(filename):
global mem, grid
global Mem, grid
f = open(filename, "wb")
p = pickle.Pickler(f, -1)
p.dump(mem)
p.dump(Mem)
del p
f.close()
def writeASM(filename):
global mem
global Mem
if not filename.endswith('.asm'):
filename = filename + '.asm'
address = -1
lines = ""
addrlist = mem.keys()
addrlist = Mem.keys()
addrlist.sort()
for addr in addrlist:
addrint = int(addr, 8)
code = mem.getCode(addrint)
opcode = mem.getOp(addrint)
field = mem.getFld(addrint)
lab = mem.getLabcount(addrint)
ref = mem.getRef(addrint)
code = Mem.getCode(addrint)
opcode = Mem.getOp(addrint)
field = Mem.getFld(addrint)
lab = Mem.getLabcount(addrint)
ref = Mem.getRef(addrint)
label = ""
if lab > 0:
label = "L%05o" % effAddr(int(addr, 8))
@@ -213,89 +214,89 @@ class MyPopupMenu(wx.Menu):
self.Bind(wx.EVT_MENU, self.popupDoType, item)
def popupDoMain(self, event):
global grid, mem, newcycle, frame
global grid, Mem, NewCycle, frame
rows = grid.GetSelectedRows()
addrlist = []
for row in rows:
if grid.GetCellValue(row, ColumnCode):
addrlist.append(int(grid.GetCellValue(row, ColumnAddress), 8))
thiscycle = newcycle.next()
mem.setUndo()
processmain.process(mem, addrlist, thiscycle)
fillGrid(grid, mem)
thiscycle = NewCycle.next()
Mem.setUndo()
processmain.process(Mem, addrlist, thiscycle)
fillGrid(grid, Mem)
grid.ClearSelection()
frame.enableUndo(True)
def popupDoDisplay(self, event):
global grid, mem, newcycle
global grid, Mem, NewCycle
rows = grid.GetSelectedRows()
addrlist = []
for row in rows:
if grid.GetCellValue(row, ColumnCode):
addrlist.append(int(grid.GetCellValue(row, ColumnAddress), 8))
thiscycle = newcycle.next()
mem.setUndo()
processdisplay.process(mem, addrlist, thiscycle)
fillGrid(grid, mem)
thiscycle = NewCycle.next()
Mem.setUndo()
processdisplay.process(Mem, addrlist, thiscycle)
fillGrid(grid, Mem)
grid.ClearSelection()
frame.enableUndo(True)
def popupDoData(self, event):
global grid, mem, newcycle
thiscycle = newcycle.next()
mem.setUndo()
global grid, Mem, NewCycle
thiscycle = NewCycle.next()
Mem.setUndo()
for row in grid.GetSelectedRows():
if grid.GetCellValue(row, ColumnCode):
addr = int(grid.GetCellValue(row, ColumnAddress), 8)
processdata.process(mem, addr, thiscycle)
fillGrid(grid, mem)
processdata.process(Mem, addr, thiscycle)
fillGrid(grid, Mem)
grid.ClearSelection()
frame.enableUndo(True)
def popupSetRef(self, event):
global grid, mem
global grid, Mem
row = grid.GetSelectedRows()[0]
if grid.GetCellValue(row, ColumnCode):
addrstr = grid.GetCellValue(row, ColumnAddress)
addr = int(addrstr, 8)
ref = mem.getRef(addr)
memref = int(mem.getFld(addr), 8)
mem.setUndo()
ref = Mem.getRef(addr)
memref = int(Mem.getFld(addr), 8)
Mem.setUndo()
if ref:
mem.decLab(memref)
mem.incLab(memref)
mem.setRef(addr)
fillGrid(grid, mem)
Mem.decLab(memref)
Mem.incLab(memref)
Mem.setRef(addr)
fillGrid(grid, Mem)
frame.enableUndo(True)
grid.ClearSelection()
def popupClearRef(self, event):
global grid, mem
global grid, Mem
row = grid.GetSelectedRows()[0]
if grid.GetCellValue(row, ColumnCode):
addrstr = grid.GetCellValue(row, ColumnAddress)
addr = int(addrstr, 8)
ref = mem.getRef(addr)
memref = int(mem.getFld(addr), 8)
ref = Mem.getRef(addr)
memref = int(Mem.getFld(addr), 8)
if ref:
mem.setUndo()
mem.decLab(memref)
mem.clearRef(addr)
fillGrid(grid, mem)
Mem.setUndo()
Mem.decLab(memref)
Mem.clearRef(addr)
fillGrid(grid, Mem)
frame.enableUndo(True)
grid.ClearSelection()
def popupDoType(self, event):
global grid, mem
global grid, Mem
for row in grid.GetSelectedRows():
if grid.GetCellValue(row, ColumnCode):
addrstr = grid.GetCellValue(row, ColumnAddress)
addr = int(addrstr, 8)
word = mem.getCode(addr)
cycle = mem.getCycle(addr)
type = mem.getType(addr)
lab = mem.getLabcount(addr)
ref = mem.getRef(addr)
word = Mem.getCode(addr)
cycle = Mem.getCycle(addr)
type = Mem.getType(addr)
lab = Mem.getLabcount(addr)
ref = Mem.getRef(addr)
print "row %d, addr=%s, code=%05o, cycle=%d, type=%s, lab=%s, ref=%s" % \
(row+1, addrstr, word, cycle, type, lab, ref)
@@ -431,7 +432,7 @@ class MyFrame(wx.Frame):
event.Skip()
def Menu100(self, event):
global mem, projectName
global Mem, projectName
filename = None
dlg = wx.FileDialog(self, message="Choose a project file to load",
defaultDir=os.getcwd(), defaultFile=projectName,
@@ -440,18 +441,18 @@ class MyFrame(wx.Frame):
if dlg.ShowModal() == wx.ID_OK:
filename = dlg.GetPath()
self.grid.ClearGrid()
mem = loadProject(filename)
fillGrid(self.grid, mem)
Mem = loadProject(filename)
fillGrid(self.grid, Mem)
projectName = os.path.basename(filename)
if projectName.endswith(DEFPROJSUFFIX):
projectName = projectName[:-len(DEFPROJSUFFIX)]
dlg.Destroy()
self.enableSaveWrite(True)
mem.clearUndo()
Mem.clearUndo()
self.enableUndo(False)
def Menu101(self, event):
global mem, projectName
global Mem, projectName
filename = projectName + DEFPROJSUFFIX
if projectName == "":
dlg = wx.FileDialog(self,
@@ -470,7 +471,7 @@ class MyFrame(wx.Frame):
saveProject(filename)
def Menu102(self, event):
global mem, projectName
global Mem, projectName
dlg = wx.FileDialog(self,
message='Choose a project file to save as',
@@ -486,9 +487,9 @@ class MyFrame(wx.Frame):
dlg.Destroy()
def Menu103(self, event):
"""Choose PTP file to load blockloader and code from."""
"""Choose PTP file to load blockloader and body code from."""
global grid, mem, projectName
global grid, Mem, projectName
filename = None
dlg = wx.FileDialog(self, message="Choose an IMLAC object file to load",
@@ -498,26 +499,28 @@ class MyFrame(wx.Frame):
if dlg.ShowModal() == wx.ID_OK:
filename = dlg.GetPath()
self.grid.ClearGrid()
result = binimport.ptpimport(filename, blockloader=True, code=True)
result = loadptp.load(filename, loader=True, body=True)
if result is not None:
(mem, start, ac) = result
fillGrid(grid, mem)
(loader, memory, start, ac) = result
Mem = mem.Mem(memory)
fillGrid(grid, Mem)
projectName = os.path.basename(filename)
if projectName.endswith(DEFPTPSUFFIX):
projectName = projectName[:-len(DEFPTPSUFFIX)]
self.enableSaveWrite(True)
mem.clearUndo()
Mem.clearUndo()
self.enableUndo(False)
if start:
# mark start address as MAIN instructions
self.do_main_start(start & 077777)
self.do_main_start(start)
dlg.Destroy()
def Menu104(self, event):
"""Choose PTP file to load code from."""
"""Choose PTP file to load only body code from."""
global grid, mem, projectName
global grid, Mem, projectName
filename = None
dlg = wx.FileDialog(self, message="Choose an IMLAC object file to load",
@@ -527,26 +530,27 @@ class MyFrame(wx.Frame):
if dlg.ShowModal() == wx.ID_OK:
filename = dlg.GetPath()
self.grid.ClearGrid()
result = binimport.ptpimport(filename, blockloader=False, code=True)
result = loadptp.load(filename, loader=False, body=True)
if result is not None:
(mem, start, ac) = result
fillGrid(grid, mem)
(loader, memory, start, ac) = result
Mem = mem.Mem(memory)
fillGrid(grid, Mem)
projectName = os.path.basename(filename)
if projectName.endswith(DEFPTPSUFFIX):
projectName = projectName[:-len(DEFPTPSUFFIX)]
self.enableSaveWrite(True)
mem.clearUndo()
Mem.clearUndo()
self.enableUndo(False)
if start:
# mark start address as MAIN instructions
self.do_main_start(start & 077777)
self.do_main_start(start)
dlg.Destroy()
def Menu105(self, event):
"""Choose PTP file to load blockloader from."""
global grid, mem, projectName
global grid, Mem, projectName
filename = None
dlg = wx.FileDialog(self, message="Choose an IMLAC object file to load",
@@ -556,24 +560,24 @@ class MyFrame(wx.Frame):
if dlg.ShowModal() == wx.ID_OK:
filename = dlg.GetPath()
self.grid.ClearGrid()
result = binimport.ptpimport(filename, blockloader=True, code=False)
result = loadptp.load(filename, loader=True, body=False)
if result is not None:
(mem, start, ac) = result
fillGrid(grid, mem)
(loader, memory, start, ac) = result
Mem = mem.Mem(memory)
fillGrid(grid, Mem)
projectName = os.path.basename(filename)
if projectName.endswith(DEFPTPSUFFIX):
projectName = projectName[:-len(DEFPTPSUFFIX)]
self.enableSaveWrite(True)
mem.clearUndo()
Mem.clearUndo()
self.enableUndo(False)
if start:
# mark start address as MAIN instructions
self.do_main_start(start & 077777)
# mark start address as MAIN instructions
self.do_main_start(03700)
dlg.Destroy()
def Menu109(self, event):
global mem, grid, projectName
global Mem, grid, projectName
filename = None
dlg = wx.FileDialog(self,
message="Choose an IMLAC assembler file to write",
@@ -611,14 +615,25 @@ class MyFrame(wx.Frame):
wx.AboutBox(info)
def Menu309(self, event):
global mem, grid
mem.undoX()
fillGrid(grid, mem)
global Mem, grid
Mem.undoX()
fillGrid(grid, Mem)
def do_main_start(self, start):
"""Mark start address as MAIN opcodes."""
print('do_main_start: start=%06o' % start)
global Mem, NewCycle
# thiscycle = NewCycle.next()
# processmain.process(Mem, [start], thiscycle)
thiscycle = NewCycle.next()
Mem.setUndo()
processmain.process(Mem, [start], thiscycle)
fillGrid(grid, Mem)
grid.ClearSelection()
frame.enableUndo(True)
class MyApp(wx.App):

38
idasm/loadptp.py
View File

@@ -192,17 +192,18 @@ def c8lds_handler(ptp_data, memory, loader=False, body=False):
# empty tape
debug('c8lds: No leader?')
return None
debug('c8lds: after zero leader, index=%d' % index)
if loader:
index = read_blockloader(ptp_data, index, memory=memory)
else:
unused_mem = {}
index = read_blockloader(ptp_data, index, memory=unused_mem)
index = read_blockloader(ptp_data, index, memory={})
if index is None:
# short block loader?
debug('c8lds: Short leader?')
return None
debug('c8lds: after blockloader, index=%d' % index)
# now read data blocks
if not body:
@@ -213,6 +214,7 @@ def c8lds_handler(ptp_data, memory, loader=False, body=False):
# empty tape
debug('c8lds: EOT looking for block?')
return None
debug('c8lds: index before block=%d' % index)
# get data word count
result = get_byte(ptp_data, index)
@@ -231,6 +233,10 @@ def c8lds_handler(ptp_data, memory, loader=False, body=False):
return None
(address, index) = result
debug('c8lds: load address=%06o' % address)
if address > 03777:
# bad load address
debug('c8lds: Bad load address=%06o' % address)
return None
if address == 0177777:
# it's an End-Of-Tape block!
return (None, None)
@@ -351,6 +357,11 @@ def lc16sd_handler(ptp_data, memory, loader=False, body=False):
(initAC, index) = result
return (address & 0x3fff, initAC)
return (None, None)
else:
if address > 03777:
# bad load address
debug('lc16sd: Bad load address=%06o' % address)
return None
# read data block, calculating checksum
csum = address # start checksum with base address
@@ -395,10 +406,10 @@ def lc16sd_handler(ptp_data, memory, loader=False, body=False):
return None
# list of recognized loaders and handlers
Loaders = [
('c8lds', c8lds_handler),
('lc16sd', lc16sd_handler),
]
Handlers = [
('lc16sd', lc16sd_handler), # lc16sd first as c8lds is very easy
('c8lds', c8lds_handler),
]
def load(filename, loader=False, body=False):
"""Load a PTP file into a memory object after figuring out its format.
@@ -408,11 +419,12 @@ def load(filename, loader=False, body=False):
body True if the body code is to be loaded
Returns None if there was a problem, else returns a tuple
(loader, memory, start, initial_ac)
where the 'loader' string identifies the loader,
'memory' is a memory object holding the loaded code,
(name, memory, start, initial_ac)
where the 'name' string wgich identifies the loader used,
'memory' is a memory object holding the loaded code:
{address: code, ...},
'start' is the start addres, if any
'initial_ac' is the initial contents of AC
'initial_ac' is the initial contents of AC, if any
"""
# get all of PTP file into memory
@@ -432,10 +444,10 @@ def load(filename, loader=False, body=False):
ptp_data = [ord(x) for x in data]
# try loaders in order
for (name, loader) in Loaders:
for (name, handler) in Handlers:
try:
memory = {}
result = loader(ptp_data, memory, loader=loader, body=body)
result = handler(ptp_data, memory, loader=loader, body=body)
debug('%s: result=%s' % (name, str(result)))
except IndexError:
result = None
@@ -456,7 +468,7 @@ if __name__ == '__main__':
print('*'*60)
print(msg)
print('*'*60)
print('Usage: loadptp <filename>')
print('Usage: loadptp <file> [ <file> ... ]')
sys.exit(10)
if len(sys.argv) < 2:

12
idasm/mem.py
View File

@@ -26,10 +26,20 @@ where address is the address of the data (integer)
class Mem(object):
def __init__(self):
def __init__(self, oldmem=None):
"""Init a Mem object.
oldmem optional dict: {addr: code, ...}
"""
self.memory = {}
self.undo = None
# handle optional initial values
if oldmem is not None:
for (address, code) in oldmem.items():
self.add(address, code)
def add(self, address, code):
self.putMem(address, (code, "", "", 0, False, None, 0))

9
idasm/processmain.py
View File

@@ -70,6 +70,15 @@ def isSkip(code):
return False
def process(mem, addrlist, newcycle):
"""Mark address in 'addrlist' as MAIN instructions.
mem the Mem() object holding memory contents
addrlist list of addresses to mark
newcycle a new cycle number
Is smart and adds targets of JMP, ISZ, etc, to addrlist.
"""
for addr in addrlist:
enqueMain(addr)
while len(mainQ) > 0:

2
pyasm/pyasm
View File

@@ -532,7 +532,7 @@ def write_block():
write_leader()
write_block_c8lds()
else:
write_leader()
# write_leader()
write_block_lc16sd()
def write_block_c8lds():