T0b1/test-repo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support tables with multiple roots

Browse Source
This commit is contained in:
Alexis Engelke
2019-02-23 11:04:57 +01:00
parent 81224d1748
commit ffa28357ce
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parseinstrs.py
View File

@@ -187,9 +187,10 @@ def parse_opcode(opcode_string):
return [common_prefix + ((last_type, last_index + i),) for i in range(8)] return [common_prefix + ((last_type, last_index + i),) for i in range(8)]
class Table: class Table:
def __init__(self): def __init__(self, root_count=1):
self.data = OrderedDict() self.data = OrderedDict()
self.data["root"] = (EntryKind.TABLE256, [None] * 256) for i in range(root_count):
self.data["root%d"%i] = (EntryKind.TABLE256, [None] * 256)
self.instrs = {} self.instrs = {}
def compile(self, mnemonics_lut): def compile(self, mnemonics_lut):
@@ -230,11 +231,11 @@ class Table:
print("%d bytes" % len(data), stats) print("%d bytes" % len(data), stats)
return data, annotations return data, annotations
def add_opcode(self, opcode, instrData): def add_opcode(self, opcode, instrData, root_idx=0):
opcode = list(opcode) + [(None, None)] opcode = list(opcode) + [(None, None)]
opcode = [(opcode[i+1][0], opcode[i][1]) for i in range(len(opcode)-1)] opcode = [(opcode[i+1][0], opcode[i][1]) for i in range(len(opcode)-1)]
name, table = "", self.data["root"] name, table = "t%d"%root_idx, self.data["root%d"%root_idx]
for kind, byte in opcode[:-1]: for kind, byte in opcode[:-1]:
if table[1][byte] is None: if table[1][byte] is None:
name += "{:02x}".format(byte) name += "{:02x}".format(byte)