diff --git a/python_arborist.py b/python_arborist.py index 00ccc6ff71e5705f1e59db49749b8c83432f5666..9c91117740333a144377fcece8a09a79c736cf06 100644 --- a/python_arborist.py +++ b/python_arborist.py @@ -185,19 +185,21 @@ class Cirno(Elaboratable): def extractor(x): return (x & 0x00ff) execute_rules = [ - (3, (lambda stackview: EXPRESSION + (extractor(stackview[0]) + extractor(stackview[2])))), + (3, (lambda stackview: EXPRESSION )), #+ (extractor(stackview[0]) + extractor(stackview[2])))), - (1, (lambda stackview: EXPRESSION + extractor(stackview[0]))), + (1, (lambda stackview: EXPRESSION)), # + extractor(stackview[0]))), - (3, (lambda stackview: TERM + (extractor(stackview[0]) * extractor(stackview[2])))), + (3, (lambda stackview: TERM )), #+ (extractor(stackview[0]) * extractor(stackview[2])))), - (1, (lambda stackview: TERM + extractor(stackview[0]))), + (1, (lambda stackview: TERM )),# + extractor(stackview[0]))), - (3, (lambda stackview: FACTOR + extractor(stackview[1]))), + (3, (lambda stackview: FACTOR )), #+ extractor(stackview[1]))), - (1, (lambda stackview: FACTOR + extractor(stackview[0]))) + (1, (lambda stackview: FACTOR ))#+ extractor(stackview[0]))) ] + + msm = MasterStateMachine(item_width=16, indices_width=16, stack_depth=16, validitem_ruleset = validitem_ruleset, pairwise_priority_ruleset = pairwise_priority_ruleset,