peperunas/gipu
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

possibile aggiungere commenti, sul serio

Browse Source
This commit is contained in:
Giulio De Pasquale 2017-05-25 12:13:28 +02:00
parent 7b972fc406
commit 19b6c69237
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assembler/assembler.py
View File

@ -102,7 +102,6 @@ class VMAssembler:
symcall = symcall_re.match(str(i)) symcall = symcall_re.match(str(i))
if symcall: if symcall:
symname = symcall.group(1) symname = symcall.group(1)
# checking if it's a jump to a label # checking if it's a jump to a label
if symname in [y.label for x in self.functions for y in x.instructions]: if symname in [y.label for x in self.functions for y in x.instructions]:
fun = next( fun = next(
@ -235,7 +234,6 @@ class VMAssembler:
reg_op_re = re.compile(".*[rR]$") reg_op_re = re.compile(".*[rR]$")
symcall = symcall_re.match(str(instruction)) symcall = symcall_re.match(str(instruction))
dst = instruction.args[0] dst = instruction.args[0]
print(instruction)
# define the kind of jump: to immediate or to register # define the kind of jump: to immediate or to register
if imm_op_re.match(instruction.opcode.name): if imm_op_re.match(instruction.opcode.name):
self.immonly(instruction) self.immonly(instruction)
@ -347,7 +345,6 @@ class VMInstruction:
raise InvalidOperation(opcode) raise InvalidOperation(opcode)
self.size = ops_sizes[self.opcode.method] self.size = ops_sizes[self.opcode.method]
args = [x for x in ins.groups()[1:] if x is not None] args = [x for x in ins.groups()[1:] if x is not None]
print("OP: {} | ARGS: {} | SYMCALL: {}".format(self.opcode, args,symcall))
for a in args: for a in args:
if immediate_re.match(a) or symcall: if immediate_re.match(a) or symcall:
# directly append the immediate # directly append the immediate
@ -485,13 +482,13 @@ ops_sizes = {"reg2reg": 2,
ops = [VMComponent(le[0], i, le[1]) for i, le in enumerate(op_names)] ops = [VMComponent(le[0], i, le[1]) for i, le in enumerate(op_names)]
regs = [VMComponent(s.casefold(), i) for i, s in enumerate(reg_names)] regs = [VMComponent(s.casefold(), i) for i, s in enumerate(reg_names)]
instruction_re = re.compile( instruction_re = re.compile(
"^([\w]{4})(?:(?:\ *\#\ *[\w]*)|(?:\ +(?:([\w]+)\ *(?:,[\ ]*([\w]+))?)(?:\ *\#\ *[\w]*)?))?$") # 1: opcode 2+: args "^([\w]{4})(?:(?:\ *\#.*)|(?:\ +(?:([\w]+)\ *(?:,[\ ]*([\w]+))?)(?:\ *\#.*)?))?$") # 1: opcode 2+: args
function_re = re.compile("(?:def\ )([a-zA-Z]*)\:") function_re = re.compile("(?:def\ )([a-zA-Z]*)\:(?:\ *\#.*)?$")
immediate_re = re.compile("(?:0x)?[0-9a-fA-F]+$") immediate_re = re.compile("(?:0x)?[0-9a-fA-F]+$")
alpha_re = re.compile("^[a-zA-Z]*$") alpha_re = re.compile("^[a-zA-Z]*$")
register_re = re.compile("(^[rRsS][0-4]$)|([iIrRsS][pP]$)") register_re = re.compile("(^[rRsS][0-4]$)|([iIrRsS][pP]$)")
label_re = re.compile("^([a-zA-Z]+)\:(?:\ *\#\ *[\w]*)?$") label_re = re.compile("^([a-zA-Z]+)\:(?:\ *\#.*)?$")
symcall_re = re.compile("^(?:[jJ][pPmM][pPaAbBeEnN][iIrR]|(?:[cC][aA][lL]{2}))(\ +[\w]+)(?:\ *\#\ *[\w]*)?$") symcall_re = re.compile("^(?:[jJ][pPmM][pPaAbBeEnN][iIrR]|(?:[cC][aA][lL]{2}))\ +([\w]+)(?:\ *\#.*)?$")
def main(): def main():