From fc9ec72eb006897400632b1a9c5d277a78fd1c48 Mon Sep 17 00:00:00 2001
From: Kia <kia@special-circumstanc.es>
Date: Sun, 7 Jun 2020 18:53:27 -0600
Subject: [PATCH] top_bit fixing
---
combinatorial_LR_parser.py | 4 ++--
python_arborist.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/combinatorial_LR_parser.py b/combinatorial_LR_parser.py
index 6da2b7b..ce18388 100644
--- a/combinatorial_LR_parser.py
+++ b/combinatorial_LR_parser.py
@@ -708,7 +708,7 @@ class MasterStateMachine(Elaboratable):
def elaborate(self, platform):
m = Module()
#stack = InspectableStack(item_width=self.item_width, stack_depth=self.stack_depth)
- doublestacks = StacksInSync(bigstack_item_width=self.item_width, sidestack_item_width=self.indices_width, stack_depth = self.stack_depth)
+ doublestacks = StacksInSync(bigstack_item_width=self.item_width, sidestack_item_width=self.indices_width + 1, stack_depth = self.stack_depth)
rule_matcher = HitOrMiss(item_width=self.item_width, stack_depth=self.stack_depth,
validitem_ruleset = self.validitem_ruleset,
@@ -866,7 +866,7 @@ class MasterStateMachine(Elaboratable):
with m.If(number_to_pop == 0):
m.d.comb += doublestacks.command_in.eq(2)
m.d.comb += doublestacks.big_push_port.eq(execution_result)
- m.d.comb += doublestacks.side_push_port.eq(serializer.serialized_index | 0x1000) #FIXME
+ m.d.comb += doublestacks.side_push_port.eq(serializer.serialized_index | (1<<(self.indices_width))) #FIXME
m.d.comb += doublestacks.command_in_strobe.eq(1)
# m.d.comb += fsm_ready.eq(1)
diff --git a/python_arborist.py b/python_arborist.py
index 9c91117..2c3b515 100644
--- a/python_arborist.py
+++ b/python_arborist.py
@@ -326,7 +326,7 @@ print("EGG")
print(serialized_tree_final)
-top_bit = 0x1000
+top_bit = (1<<16)
def deserializer(serialized_array):
--
GitLab