remove no-longer-needed pass dependent code from SymbolTable

SymbolTable used the pass number to handle some special cases in pass 1
of assembling, by returning dummy values. Since the first pass no longer
creates actual instructions, the SymbolTable no longer needs to do this
and no longer needs to be aware of the pass the assembler is in.

Author: wnienhaus

esp32_ulp/assemble.py

@@ -16,10 +16,6 @@ def __init__(self, symbols, bases, globals):
         self._symbols = symbols
         self._bases = bases
         self._globals = globals
-        self._pass = None
-
-    def set_pass(self, _pass):
-        self._pass = _pass
 
     def set_bases(self, bases):
         self._bases = bases
@@ -40,13 +36,7 @@ def has_sym(self, symbol):
         return symbol in self._symbols
 
     def get_sym(self, symbol):
-        try:
-            entry = self._symbols[symbol]
-        except KeyError:
-            if self._pass == 1:
-                entry = (REL, TEXT, 0)  # for a dummy, this is good enough
-            else:
-                raise
+        entry = self._symbols[symbol]
         return entry
 
     def dump(self):
@@ -60,13 +50,7 @@ def export(self, incl_non_globals=False):
         return sorted(addrs_syms)
 
     def to_abs_addr(self, section, offset):
-        try:
-            base = self._bases[section]
-        except KeyError:
-            if self._pass == 1:
-                base = 0  # for a dummy this is good enough
-            else:
-                raise
+        base = self._bases[section]
         return base + offset
 
     def resolve_absolute(self, symbol):
@@ -109,7 +93,6 @@ def __init__(self, symbols=None, bases=None, globls=None):
 
     def init(self, a_pass):
         self.a_pass = a_pass
-        self.symbols.set_pass(a_pass)
         self.sections = dict(text=[], data=[])
         self.offsets = dict(text=0, data=0, bss=0)
         self.section = TEXT

tests/assemble.py

@@ -199,25 +199,28 @@ def test_symbols():
     ]:
         st.set_sym(*entry)
     # PASS 1 ========================================================
-    st.set_pass(1)
     assert st.has_sym('abs_t4')
     assert st.get_sym('abs_t4') == (ABS, TEXT, 4)
     assert not st.has_sym('notexist')
-    assert st.get_sym('notexist') == (REL, TEXT, 0)  # pass1 -> dummy
+    try:
+        st.get_sym('notexist')  # pass1 -> raises
+    except KeyError:
+        raised = True
+    else:
+        raised = False
+    assert raised
     assert st.resolve_absolute('abs_t4') == 4
-    assert st.resolve_absolute('abs_d4') == 4
-    assert st.resolve_absolute('rel_t4') == 4
-    assert st.resolve_absolute('rel_d4') == 4
-    assert st.resolve_absolute('const') == 123
-    st.set_from(TEXT, 8)
-    assert st.resolve_relative('abs_t4') == -4
-    assert st.resolve_relative('abs_d4') == -4
-    assert st.resolve_relative('rel_t4') == -4
-    assert st.resolve_relative('rel_d4') == -4
+    try:
+        # relative symbols cannot be resolved, because in pass 1 section bases are not yet defined
+        st.resolve_absolute('rel_t4')
+    except KeyError:
+        raised = True
+    else:
+        raised = False
+    assert raised
     assert st.resolve_absolute('const') == 123
     # PASS 2 ========================================================
     st.set_bases({TEXT: 100, DATA: 200})
-    st.set_pass(2)
     assert st.has_sym('abs_t4')
     assert st.get_sym('abs_t4') == (ABS, TEXT, 4)
     assert not st.has_sym('notexist')