diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-04-26 15:32:02 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-04-26 15:32:02 -0700 |
| commit | dcc8a13e481c058f17b98ea900f9feb9192ea5ae (patch) | |
| tree | 2fb3f67cd4951d79c71e754d45c5b1e7dae8cebb /kernel | |
| parent | 8469d9fe9ff0a819c6b67aa6121cfd01cd1d0665 (diff) | |
| download | yosys-dcc8a13e481c058f17b98ea900f9feb9192ea5ae.tar.gz yosys-dcc8a13e481c058f17b98ea900f9feb9192ea5ae.tar.bz2 yosys-dcc8a13e481c058f17b98ea900f9feb9192ea5ae.zip | |
Revert "Merge branch 'eddie/split_shiftx' into xc7mux"
This reverts commit 3042d5833041021bb45252b0cc862e9eff3d27d3, reversing
changes made to feff9764540cbf1152459cb377fc68d8e10c7153.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cellaigs.cc | 2 | ||||
| -rw-r--r-- | kernel/celltypes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cellaigs.cc b/kernel/cellaigs.cc index 26c625f89..5fd76afe5 100644 --- a/kernel/cellaigs.cc +++ b/kernel/cellaigs.cc @@ -453,7 +453,7 @@ Aig::Aig(Cell *cell) int B = mk.inport("\\B"); int C = mk.inport("\\C"); int D = mk.inport("\\D"); - int Y = mk.nand_gate(mk.or_gate(A, B), mk.or_gate(C, D)); + int Y = mk.nand_gate(mk.nor_gate(A, B), mk.nor_gate(C, D)); mk.outport(Y, "\\Y"); goto optimize; } diff --git a/kernel/celltypes.h b/kernel/celltypes.h index 0da78c313..ae88f4aaf 100644 --- a/kernel/celltypes.h +++ b/kernel/celltypes.h @@ -464,7 +464,7 @@ struct CellTypes if (cell->type == "$_AOI4_") return eval_not(const_or(const_and(arg1, arg2, false, false, 1), const_and(arg3, arg4, false, false, 1), false, false, 1)); if (cell->type == "$_OAI4_") - return eval_not(const_and(const_or(arg1, arg2, false, false, 1), const_or(arg3, arg4, false, false, 1), false, false, 1)); + return eval_not(const_and(const_or(arg1, arg2, false, false, 1), const_and(arg3, arg4, false, false, 1), false, false, 1)); log_assert(arg4.bits.size() == 0); return eval(cell, arg1, arg2, arg3, errp); |