Fix old bugs

This commit is contained in:
Martin Hosken 2017-11-06 21:16:16 +07:00
parent 4a009d1eea
commit eb003ea697

View File

@ -195,7 +195,7 @@ def disassemble(aCode):
pc = 0 pc = 0
res = [] res = []
while pc < codelen: while pc < codelen:
opcode = ord(aCode[pc:pc+1]) opcode = byteord(aCode[pc:pc+1])
if opcode > len(aCode_info): if opcode > len(aCode_info):
instr = aCode_info[0] instr = aCode_info[0]
else: else:
@ -203,7 +203,7 @@ def disassemble(aCode):
pc += 1 pc += 1
if instr[1] != 0 and pc >= codelen : return res if instr[1] != 0 and pc >= codelen : return res
if instr[1] == -1: if instr[1] == -1:
count = ord(aCode[pc]) count = byteord(aCode[pc])
fmt = "%dB" % count fmt = "%dB" % count
pc += 1 pc += 1
elif instr[1] == 0: elif instr[1] == 0:
@ -230,7 +230,7 @@ def assemble(instrs):
if m.group(2): if m.group(2):
if parmfmt == 0: if parmfmt == 0:
continue continue
parms = map(int, re.split(",\s*", m.group(2))) parms = [int(x) for x in re.split(",\s*", m.group(2))]
if parmfmt == -1: if parmfmt == -1:
l = len(parms) l = len(parms)
res.append(struct.pack(("%dB" % (l+1)), l, *parms)) res.append(struct.pack(("%dB" % (l+1)), l, *parms))