riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3433 from jix/fix_smt_shift 

smt2: Fix $shift/$shiftx with negative shift ammounts
This commit is contained in:
Jannis Harder 2022-08-02 21:12:32 +02:00 committed by GitHub
parent 7d4f87d69f 6af5e74f95
commit b8316b2f13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backends/smt2/smt2.cc
View File

@ -449,7 +449,7 @@ struct Smt2Worker
bool is_signed = cell->getParam(ID::A_SIGNED).as_bool(); bool is_signed = cell->getParam(ID::A_SIGNED).as_bool();
int width = GetSize(sig_y); int width = GetSize(sig_y);
if (type == 's' || type == 'd' || type == 'b') { if (type == 's' || type == 'S' || type == 'd' || type == 'b') {
width = max(width, GetSize(cell->getPort(ID::A))); width = max(width, GetSize(cell->getPort(ID::A)));
if (cell->hasPort(ID::B)) if (cell->hasPort(ID::B))
width = max(width, GetSize(cell->getPort(ID::B))); width = max(width, GetSize(cell->getPort(ID::B)));
@ -462,7 +462,7 @@ struct Smt2Worker
if (cell->hasPort(ID::B)) { if (cell->hasPort(ID::B)) {
sig_b = cell->getPort(ID::B); sig_b = cell->getPort(ID::B);
sig_b.extend_u0(width, is_signed && !(type == 's')); sig_b.extend_u0(width, (type == 'S') || (is_signed && !(type == 's')));
} }
std::string processed_expr; std::string processed_expr;
@ -619,8 +619,8 @@ struct Smt2Worker
if (cell->type.in(ID($shift), ID($shiftx))) { if (cell->type.in(ID($shift), ID($shiftx))) {
if (cell->getParam(ID::B_SIGNED).as_bool()) { if (cell->getParam(ID::B_SIGNED).as_bool()) {
return export_bvop(cell, stringf("(ite (bvsge P #b%0*d) " return export_bvop(cell, stringf("(ite (bvsge P #b%0*d) "
"(bvlshr A B) (bvlshr A (bvneg B)))", "(bvlshr A B) (bvshl A (bvneg B)))",
GetSize(cell->getPort(ID::B)), 0), 's'); GetSize(cell->getPort(ID::B)), 0), 'S'); // type 'S' sign extends B
} else { } else {
return export_bvop(cell, "(bvlshr A B)", 's'); return export_bvop(cell, "(bvlshr A B)", 's');
} }