Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: azonenberg/yosys
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6fed2dc996a5
Choose a base ref
...
head repository: azonenberg/yosys
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2eabe43efa59
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 16, 2017

  1. Copy the full SHA
    e6d56d2 View commit details
  2. Copy the full SHA
    cf25dc9 View commit details
  3. Copy the full SHA
    2eabe43 View commit details
Showing with 9 additions and 3 deletions.
  1. +1 −1 kernel/celltypes.h
  2. +8 −2 passes/techmap/techmap.cc
2 changes: 1 addition & 1 deletion kernel/celltypes.h
Original file line number Diff line number Diff line change
@@ -313,7 +313,7 @@ struct CellTypes
if (type == "$_OR_")
return const_or(arg1, arg2, false, false, 1);
if (type == "$_NOR_")
return eval_not(const_and(arg1, arg2, false, false, 1));
return eval_not(const_or(arg1, arg2, false, false, 1));
if (type == "$_XOR_")
return const_xor(arg1, arg2, false, false, 1);
if (type == "$_XNOR_")
10 changes: 8 additions & 2 deletions passes/techmap/techmap.cc
Original file line number Diff line number Diff line change
@@ -327,8 +327,9 @@ struct TechmapWorker
for (auto &it : tpl->cells_)
{
std::string c_name = it.second->name.str();
bool techmap_replace_cell = (!flatten_mode) && (c_name == "\\_TECHMAP_REPLACE_");

if (!flatten_mode && c_name == "\\_TECHMAP_REPLACE_")
if (techmap_replace_cell)
c_name = orig_cell_name;
else
apply_prefix(cell->name.str(), c_name);
@@ -358,6 +359,11 @@ struct TechmapWorker

if (c->attributes.count("\\src"))
c->add_strpool_attribute("\\src", extra_src_attrs);

if (techmap_replace_cell)
for (auto attr : cell->attributes)
if (!c->attributes.count(attr.first))
c->attributes[attr.first] = attr.second;
}

for (auto &it : tpl->connections()) {
@@ -1005,7 +1011,7 @@ struct TechmapPass : public Pass {
log("constant value.\n");
log("\n");
log("A cell with the name _TECHMAP_REPLACE_ in the map file will inherit the name\n");
log("of the cell that is being replaced.\n");
log("and attributes of the cell that is being replaced.\n");
log("\n");
log("See 'help extract' for a pass that does the opposite thing.\n");
log("\n");