mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-23 09:05:32 +00:00
Code Activity

Added $slice and $concat cell types

Browse source
This commit is contained in:
Clifford Wolf 2014-02-07 17:44:57 +01:00
parent a1ac710ab8
commit fc3b3c4ec3
8 changed files with 140 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kernel/celltypes.h
View file

@ -270,6 +270,20 @@ struct CellTypes
static RTLIL::Const eval(RTLIL::Cell *cell, const RTLIL::Const &arg1, const RTLIL::Const &arg2)
{
if (cell->type == "$slice") {
RTLIL::Const ret;
int width = cell->parameters.at("\\Y_WIDTH").as_int();
int offset = cell->parameters.at("\\OFFSET").as_int();
ret.bits.insert(ret.bits.end(), arg1.bits.begin()+offset, arg1.bits.begin()+offset+width);
return ret;
}
if (cell->type == "$concat") {
RTLIL::Const ret = arg1;
ret.bits.insert(ret.bits.end(), arg2.bits.begin(), arg2.bits.end());
return ret;
}
bool signed_a = cell->parameters.count("\\A_SIGNED") > 0 && cell->parameters["\\A_SIGNED"].as_bool();
bool signed_b = cell->parameters.count("\\B_SIGNED") > 0 && cell->parameters["\\B_SIGNED"].as_bool();
int result_len = cell->parameters.count("\\Y_WIDTH") > 0 ? cell->parameters["\\Y_WIDTH"].as_int() : -1;
@ -289,10 +303,7 @@ struct CellTypes
}
assert(sel.bits.size() == 0);
bool signed_a = cell->parameters.count("\\A_SIGNED") > 0 && cell->parameters["\\A_SIGNED"].as_bool();
bool signed_b = cell->parameters.count("\\B_SIGNED") > 0 && cell->parameters["\\B_SIGNED"].as_bool();
int result_len = cell->parameters.count("\\Y_WIDTH") > 0 ? cell->parameters["\\Y_WIDTH"].as_int() : -1;
return eval(cell->type, arg1, arg2, signed_a, signed_b, result_len);
return eval(cell, arg1, arg2);
}
};

18
kernel/rtlil.cc
View file

@ -462,6 +462,24 @@ namespace {
return;
}
if (cell->type == "$slice") {
param("\\OFFSET");
port("\\A", param("\\A_WIDTH"));
port("\\Y", param("\\Y_WIDTH"));
if (param("\\OFFSET") + param("\\Y_WIDTH") > param("\\A_WIDTH"))
error(__LINE__);
check_expected();
return;
}
if (cell->type == "$concat") {
port("\\A", param("\\A_WIDTH"));
port("\\B", param("\\B_WIDTH"));
port("\\Y", param("\\A_WIDTH") + param("\\B_WIDTH"));
check_expected();
return;
}
if (cell->type == "$mux") {
port("\\A", param("\\WIDTH"));
port("\\B", param("\\WIDTH"));

21
kernel/satgen.h
View file

@ -761,6 +761,27 @@ struct SatGen
return true;
}
if (cell->type == "$slice")
{
RTLIL::SigSpec a = cell->connections.at("\\A");
RTLIL::SigSpec y = cell->connections.at("\\Y");
ez->assume(signals_eq(a.extract(cell->parameters.at("\\OFFSET").as_int(), y.width), y, timestep));
return true;
}
if (cell->type == "$concat")
{
RTLIL::SigSpec a = cell->connections.at("\\A");
RTLIL::SigSpec b = cell->connections.at("\\B");
RTLIL::SigSpec y = cell->connections.at("\\Y");
RTLIL::SigSpec ab = a;
ab.append(b);
ez->assume(signals_eq(ab, y, timestep));
return true;
}
if (timestep > 0 && (cell->type == "$dff" || cell->type == "$_DFF_N_" || cell->type == "$_DFF_P_"))
{
if (timestep == 1)