arrdem/source
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity

Tweaking the stack analyzer

Browse source
This commit is contained in:
Reid 'arrdem' McKenzie 2022-08-19 00:43:42 -06:00
parent 71a60ae079
commit fbe837797a
4 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
projects/shoggoth/src/python/ichor/assembler.py
View file

@ -1,5 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import logging
from random import choices from random import choices
from string import ascii_lowercase, digits from string import ascii_lowercase, digits
from typing import List, Optional, Sequence, Union from typing import List, Optional, Sequence, Union
@ -7,6 +8,9 @@ from typing import List, Optional, Sequence, Union
from ichor import isa from ichor import isa
log = logging.getLogger(__name__)
def gensym(prefix = None) -> isa.Label: def gensym(prefix = None) -> isa.Label:
frag = "".join(choices(ascii_lowercase + digits, k=8)) frag = "".join(choices(ascii_lowercase + digits, k=8))
return isa.Label(f"{prefix or 'gensym'}_{frag}") return isa.Label(f"{prefix or 'gensym'}_{frag}")
@ -26,22 +30,14 @@ class FuncBuilder(object):
if not self._straightline: if not self._straightline:
return return
start_stack = self._stack
match op: match op:
case isa.Label(_): case isa.Label(_) | isa.GOTO(_) | isa.ATEST(_):
# Labels abort # Labels and control ops abort
self._straightline = False
case isa.GOTO(_) | isa.ATEST(_):
# Control ops abort
self._straightline = False self._straightline = False
case isa.CLOSUREC(n) | isa.CLOSUREF(n): case isa.CLOSUREC(n) | isa.CLOSUREF(n):
self._stack -= n self._stack -= n
case isa.TYPEREF():
pass
case isa.ARMREF(): case isa.ARMREF():
self._stack -= 1 self._stack -= 1
@ -51,14 +47,15 @@ class FuncBuilder(object):
case isa.DUP(n): case isa.DUP(n):
self._stack += n self._stack += n
case isa.ROT(_): case isa.IDENTIFIERC(_) | isa.SLOT(_) | isa.CALLF(_) | isa.CALLC(_) | isa.ARM(_):
pass
case _:
self._stack -= getattr(op, "nargs", 0) self._stack -= getattr(op, "nargs", 0)
self._stack += 1 self._stack += 1
print(op, "pre", start_stack, "post", self._stack) case isa.ROT(_) | isa.FUNREF(_) | isa.TYPEREF() | isa.ALOAD():
pass
case _:
log.debug("No stack manipulation known for %s, assuming no change", op)
def write(self, op: Union[isa.Opcode, isa.Label, Sequence[isa.Opcode]]): def write(self, op: Union[isa.Opcode, isa.Label, Sequence[isa.Opcode]]):

7
projects/shoggoth/src/python/ichor/isa.py
View file

@ -2,6 +2,7 @@
from abc import ABC from abc import ABC
from dataclasses import dataclass from dataclasses import dataclass
from typing import Union
@dataclass @dataclass
@ -26,7 +27,7 @@ class GOTO(Opcode):
""" """
target: int target: Union[int, Label]
################################################################################ ################################################################################
# Stack manipulation # Stack manipulation
@ -77,7 +78,7 @@ class SLOT(Opcode):
""" """
target: int target: Union[int, Label]
################################################################################ ################################################################################
# Functional abstraction # Functional abstraction
@ -227,7 +228,7 @@ class ATEST(Opcode):
""" """
target: int target: Union[int, Label]
@dataclass @dataclass

2
projects/shoggoth/test/python/ichor/test_assembler.py
View file

@ -49,7 +49,7 @@ def test_self_label(builder: FuncBuilder):
def test_local_label(builder: FuncBuilder): def test_local_label(builder: FuncBuilder):
s0 = builder.mark_slot() s0 = builder.mark_slot(target=0)
builder.write(isa.SLOT(s0)) builder.write(isa.SLOT(s0))
s999 = builder.mark_slot(target=999) s999 = builder.mark_slot(target=999)

4
projects/shoggoth/test/python/ichor/test_bootstrap.py
View file

@ -4,13 +4,13 @@ from .fixtures import * # noqa
from ichor import isa from ichor import isa
from ichor.bootstrap import ( from ichor.bootstrap import (
AND2,
AND3,
FALSE, FALSE,
NOT1, NOT1,
OR2, OR2,
OR3, OR3,
TRUE, TRUE,
AND2,
AND3
) )
import pytest import pytest