aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/celltypes.h
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-04-26 15:32:02 -0700
committerEddie Hung <eddie@fpgeh.com>2019-04-26 15:32:02 -0700
commitdcc8a13e481c058f17b98ea900f9feb9192ea5ae (patch)
tree2fb3f67cd4951d79c71e754d45c5b1e7dae8cebb /kernel/celltypes.h
parent8469d9fe9ff0a819c6b67aa6121cfd01cd1d0665 (diff)
downloadyosys-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/celltypes.h')
-rw-r--r--kernel/celltypes.h2
1 files changed, 1 insertions, 1 deletions
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);