Skip to content

Commit 924db69

Browse files
committed
Attempting fix for PR chipsalliance#3670
1 parent 3068404 commit 924db69

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

.github/workflows/yosys-plugin.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ jobs:
6868
- name: Build binaries
6969
run: |
7070
cd yosys-uhdm-plugin-integration
71+
72+
mv Surelog/0001-chipsalliance-Surelog-3670.patch yosys-f4pga-plugins/.
73+
cd yosys-f4pga-plugins
74+
git am 0001-chipsalliance-Surelog-3670.patch
75+
cd ..
76+
7177
./build_binaries.sh
7278
7379
- name: Build & Test Ibex
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 9b52c0a72cc0d16522615d19df2eaa04b2cdf199 Mon Sep 17 00:00:00 2001
2+
3+
Date: Sun, 28 May 2023 10:42:52 -0700
4+
Subject: [PATCH] chipsalliance/Surelog#3670
5+
6+
---
7+
systemverilog-plugin/UhdmAst.cc | 6 ------
8+
1 file changed, 6 deletions(-)
9+
10+
diff --git a/systemverilog-plugin/UhdmAst.cc b/systemverilog-plugin/UhdmAst.cc
11+
index 00816d6..ce0c539 100644
12+
--- a/systemverilog-plugin/UhdmAst.cc
13+
+++ b/systemverilog-plugin/UhdmAst.cc
14+
@@ -3242,9 +3242,6 @@ void UhdmAst::process_bit_select()
15+
void UhdmAst::process_part_select()
16+
{
17+
current_node = make_ast_node(AST::AST_IDENTIFIER);
18+
- vpiHandle parent_h = vpi_handle(vpiParent, obj_h);
19+
- current_node->str = get_name(parent_h);
20+
- vpi_release_handle(parent_h);
21+
auto range_node = new AST::AstNode(AST::AST_RANGE);
22+
range_node->filename = current_node->filename;
23+
range_node->location = current_node->location;
24+
@@ -3255,9 +3252,6 @@ void UhdmAst::process_part_select()
25+
void UhdmAst::process_indexed_part_select()
26+
{
27+
current_node = make_ast_node(AST::AST_IDENTIFIER);
28+
- vpiHandle parent_h = vpi_handle(vpiParent, obj_h);
29+
- current_node->str = get_name(parent_h);
30+
- vpi_release_handle(parent_h);
31+
// TODO: check if there are other types, for now only handle 1 and 2 (+: and -:)
32+
auto indexed_part_select_type = vpi_get(vpiIndexedPartSelectType, obj_h) == 1 ? AST::AST_ADD : AST::AST_SUB;
33+
auto range_node = new AST::AstNode(AST::AST_RANGE);
34+
--
35+
2.38.0.windows.1
36+

0 commit comments

Comments
 (0)