optimized gc calls, optimized removal of comments

Author: ThomasWaldmann

esp32_ulp/__main__.py

@@ -1,38 +1,32 @@
 import sys
 
 from .util import garbage_collect
-garbage_collect('before import')
 
 from .assemble import Assembler
 from .link import make_binary
+garbage_collect('after import')
 
 
 def src_to_binary(src):
- garbage_collect('before assembler init')
  assembler = Assembler()
- garbage_collect('before assembler call')
  assembler.assemble(src)
  garbage_collect('before symbols export')
  addrs_syms = assembler.symbols.export()
  for addr, sym in addrs_syms:
  print('%04d %s' % (addr, sym))
 
- garbage_collect('before fetch')
  text, data, bss_len = assembler.fetch()
- garbage_collect('before make binary')
  return make_binary(text, data, bss_len)
 
 
 def main(fn):
- garbage_collect('before read')
  with open(fn) as f:
  src = f.read()
 
  binary = src_to_binary(src)
 
  if fn.endswith('.s') or fn.endswith('.S'):
  fn = fn[:-2]
- garbage_collect('before write')
  with open(fn + '.ulp', 'wb') as f:
  f.write(binary)
 

esp32_ulp/assemble.py

@@ -140,9 +140,7 @@ def parse_line(self, line):
  return label, opcode, args
 
 
- def parse(self, text):
- lines = remove_comments(text)
- garbage_collect('after remove comments')
+ def parse(self, lines):
  parsed = [self.parse_line(line) for line in lines]
  return [p for p in parsed if p is not None]
 
@@ -273,8 +271,8 @@ def assembler_pass(self, lines):
  raise Exception('Unknown opcode or directive: %s' % opcode)
  self.finalize_sections()
 
- def assemble(self, lines):
- garbage_collect('before pass1')
+ def assemble(self, text):
+ lines = remove_comments(text)
  self.init(1) # pass 1 is only to get the symbol table right
  self.assembler_pass(lines)
  self.symbols.set_bases(self.compute_bases())

tests/assemble.py

@@ -1,5 +1,6 @@
 from esp32_ulp.assemble import Assembler, TEXT, DATA, BSS, REL, ABS
 from esp32_ulp.assemble import SymbolTable
+from esp32_ulp.nocomment import remove_comments
 
 src = """\
 
@@ -25,7 +26,8 @@ def test_parse_line():
 
 def test_parse():
  a = Assembler()
- result = a.parse(src)
+ lines = remove_comments(src)
+ result = a.parse(lines)
  assert None not in result