diff --git a/CHANGELOG.org b/CHANGELOG.org index 025ff2d..cdbf923 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -25,6 +25,7 @@ Added string print and address to output of High level prototype disassembler Extended VPATH in makefile to shorten dependency names Updated checksum for stage2 forth Reversed the order of operands in stage2 forth arithmetic +Modified webIDE to leverage new enhanced disassembler output ** Fixed Stack offset bug in stage2 forth was found and fixed by reepca in record time @@ -33,6 +34,7 @@ Swapped TRUE and FALSE values in stage2 forth to match http://lars.nocrew.org/dp Adjusted order of comparisions to better match ans ** Removed +Removed need for sponge to be used to run webIDE * 0.0.7 - 2017-06-03 ** Added diff --git a/User_Interface.py b/User_Interface.py index 1429b0b..aa89bbc 100644 --- a/User_Interface.py +++ b/User_Interface.py @@ -187,20 +187,17 @@ def get_disassembled(): temp = """
""" - i = 0 for line in f: pieces = re.split(r'\t+', line) - + i = int(pieces[0], 16) if (i < Current_IP): temp = temp + "" elif (i == Current_IP): - temp = temp + """\n" + temp = temp + """\n" elif i in Watchpoints: - temp = temp + """\n" + temp = temp + """\n" else: - temp = temp + "\n" - - i = i + 4 + temp = temp + "\n" f.close() return temp + "
""" + formatRegister(i) + "" + pieces[0] + "" + pieces[1] + "
""" + pieces[0] + "" + pieces[1] + "" + pieces[2] + "
""" + formatRegister(i) + "" + pieces[0] + "" + pieces[1] + "
""" + pieces[0] + "" + pieces[1] + "" + pieces[2] + "
" + formatRegister(i) + "" + pieces[0] + "" + pieces[1] + "
" + pieces[0] + "" + pieces[1] + "" + pieces[2] + "
" @@ -242,7 +239,7 @@ def main(argv): elif arg.endswith('G'): Memory_Size = (int(arg[:-1]) * 1024 * 1024 * 1024) - subprocess.call("./bin/dis " + ROM_Name + " | sponge z_disassembled", shell=True) + subprocess.call("./bin/dis " + ROM_Name + " >| z_disassembled", shell=True) Reset_lilith() Current_IP = 0