[berkeley-abc] 01/03: Merge branch 'upstream'
Ruben Undheim
rubund-guest at moszumanska.debian.org
Fri May 29 14:26:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository berkeley-abc.
commit d945968fe2c28ef2829f253c4c0b66be4ec58665
Merge: da960dc f556d51
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Fri May 29 16:04:05 2015 +0200
Merge branch 'upstream'
Makefile | 13 +-
abclib.dsp | 148 ++
src/aig/aig/aigMem.c | 16 +-
src/aig/gia/gia.h | 53 +-
src/aig/gia/giaAiger.c | 64 +-
src/aig/gia/giaBalAig.c | 19 +
src/aig/gia/giaDup.c | 88 +-
src/aig/gia/giaEquiv.c | 34 +-
src/aig/gia/giaFadds.c | 1109 +++++++++++
src/aig/gia/giaFx.c | 33 +-
src/aig/gia/giaHash.c | 5 +-
src/aig/gia/giaIf.c | 378 ++--
src/aig/gia/giaJf.c | 2 +
src/aig/gia/giaLf.c | 2240 ++++++++++++++++++++++-
src/aig/gia/giaMan.c | 39 +-
src/aig/gia/giaMf.c | 4 +-
src/aig/gia/giaMfs.c | 505 ++---
src/aig/gia/giaMuxes.c | 12 +-
src/aig/gia/giaNf.c | 2104 ++++++++++++++++++++-
src/aig/gia/giaPf.c | 1354 ++++++++++++++
src/aig/gia/giaPolyn.c | 227 +++
src/aig/gia/giaQbf.c | 6 +-
src/aig/gia/giaScl.c | 21 +-
src/aig/gia/giaScript.c | 128 +-
src/aig/gia/giaStr.c | 1836 ++++++++++++++++++-
src/aig/gia/giaSweep.c | 523 +++++-
src/aig/gia/giaTim.c | 718 +++++---
src/aig/gia/giaUtil.c | 33 +-
src/aig/gia/module.make | 2 +
src/base/abc/abc.h | 32 +-
src/base/abc/abcCheck.c | 4 +-
src/base/abc/abcDfs.c | 247 ++-
src/base/abc/abcFunc.c | 125 +-
src/base/abc/abcHie.c | 3 +-
src/base/abc/abcHieGia.c | 582 ++++++
src/base/abc/abcLatch.c | 9 +-
src/base/abc/abcMinBase.c | 143 +-
src/base/abc/abcNames.c | 25 +
src/base/abc/abcNtk.c | 48 +-
src/base/abc/abcObj.c | 2 +-
src/base/abc/abcShow.c | 2 +-
src/base/abc/abcUtil.c | 14 +-
src/base/abc/module.make | 1 +
src/base/abci/abc.c | 1224 +++++++++++--
src/base/abci/abcCollapse.c | 69 +-
src/base/abci/abcDar.c | 164 +-
src/base/abci/abcDebug.c | 2 +-
src/base/abci/abcEspresso.c | 2 +-
src/base/abci/abcFx.c | 40 +-
src/base/abci/abcFxu.c | 2 +-
src/base/abci/abcIf.c | 23 +-
src/base/abci/abcIvy.c | 4 +-
src/base/abci/abcMap.c | 17 +-
src/base/abci/abcMffc.c | 4 +-
src/base/abci/abcMfs.c | 21 +-
src/base/abci/abcNtbdd.c | 7 +-
src/base/abci/abcPrint.c | 17 +-
src/base/abci/abcStrash.c | 11 +-
src/base/abci/abcTiming.c | 215 ++-
src/base/abci/abcUnreach.c | 2 +-
src/{aig/gia/giaNf.c => base/cba/cba.c} | 48 +-
src/base/cba/cba.h | 1018 ++++++++++
src/base/cba/cbaBlast.c | 587 ++++++
src/base/cba/cbaCba.c | 298 +++
src/base/cba/cbaCom.c | 727 ++++++++
src/{aig/gia/giaNf.c => base/cba/cbaLib.c} | 48 +-
src/base/cba/cbaNtk.c | 604 ++++++
src/base/cba/cbaOper.c | 365 ++++
src/base/cba/cbaPrs.h | 355 ++++
src/base/cba/cbaPrsBuild.c | 375 ++++
src/base/cba/cbaPrsTrans.c | 211 +++
src/base/cba/cbaPtr.c | 470 +++++
src/base/cba/cbaPtrAbc.c | 486 +++++
src/base/cba/cbaReadBlif.c | 453 +++++
src/{aig/gia/giaNf.c => base/cba/cbaReadSmt.c} | 34 +-
src/base/cba/cbaReadVer.c | 875 +++++++++
src/base/cba/cbaWriteBlif.c | 236 +++
src/{aig/gia/giaNf.c => base/cba/cbaWriteSmt.c} | 22 +-
src/base/cba/cbaWriteVer.c | 703 +++++++
src/base/cba/module.make | 15 +
src/base/cmd/cmd.c | 69 +-
src/base/cmd/cmd.h | 3 +-
src/base/cmd/cmdApi.c | 16 +
src/base/cmd/cmdHist.c | 2 +
src/base/io/io.c | 65 +-
src/base/io/ioAbc.h | 4 +-
src/base/io/ioReadBench.c | 2 +-
src/base/io/ioReadBlif.c | 165 +-
src/base/io/ioReadDsd.c | 10 +-
src/base/io/ioReadPla.c | 322 +++-
src/base/io/ioUtil.c | 36 +-
src/base/io/ioWriteBench.c | 4 +-
src/base/io/ioWriteBlif.c | 59 +-
src/base/io/ioWriteDot.c | 4 +-
src/base/io/ioWriteEqn.c | 2 +-
src/base/io/ioWriteList.c | 2 +-
src/base/io/ioWritePla.c | 328 +++-
src/base/io/ioWriteSmv.c | 2 +-
src/base/main/mainInit.c | 8 +
src/base/main/mainInt.h | 2 +
src/base/main/mainReal.c | 20 +-
src/base/pla/module.make | 8 +
src/{aig/gia/giaNf.c => base/pla/pla.c} | 50 +-
src/base/pla/pla.h | 299 +++
src/base/pla/plaCom.c | 500 +++++
src/base/pla/plaFxch.c | 854 +++++++++
src/base/pla/plaHash.c | 347 ++++
src/base/pla/plaMan.c | 259 +++
src/{aig/gia/giaNf.c => base/pla/plaMerge.c} | 49 +-
src/base/pla/plaRead.c | 224 +++
src/base/pla/plaSimple.c | 339 ++++
src/base/pla/plaWrite.c | 112 ++
src/base/ver/verCore.c | 42 +-
src/base/ver/verFormula.c | 18 +-
src/base/ver/verStream.c | 2 +-
src/base/wlc/module.make | 4 +-
src/base/wlc/wlc.h | 162 +-
src/base/wlc/wlcAbs.c | 292 +++
src/base/wlc/wlcBlast.c | 207 ++-
src/base/wlc/wlcCom.c | 120 +-
src/base/wlc/wlcNtk.c | 46 +-
src/base/wlc/wlcReadSmt.c | 904 +++++++++
src/base/wlc/wlcReadVer.c | 134 +-
src/base/wlc/wlcStdin.c | 255 +++
src/base/wlc/wlcWriteVer.c | 87 +-
src/bdd/parse/parseCore.c | 20 +-
src/bdd/parse/parseEqn.c | 18 +-
src/bool/dec/decFactor.c | 24 +-
src/bool/rpo/rpo.h | 6 +-
src/map/amap/amapParse.c | 18 +-
src/map/if/if.h | 12 +-
src/map/if/ifCut.c | 5 +-
src/map/if/ifDelay.c | 6 +-
src/map/if/ifDsd.c | 147 +-
src/map/if/ifLibBox.c | 2 +-
src/map/if/ifMan.c | 13 +
src/map/if/ifMap.c | 55 +-
src/map/if/ifSat.c | 7 +-
src/map/if/ifTune.c | 150 +-
src/map/mapper/mapper.h | 1 +
src/map/mapper/mapperCreate.c | 1 +
src/map/mapper/mapperInt.h | 3 +-
src/map/mapper/mapperMatch.c | 2 +-
src/map/mapper/mapperSuper.c | 6 +-
src/map/mio/mio.h | 4 +
src/map/mio/mioApi.c | 23 +
src/map/mio/mioInt.h | 6 +-
src/map/mio/mioParse.c | 18 +-
src/map/mio/mioRead.c | 63 +-
src/map/mio/mioUtils.c | 68 +-
src/map/scl/sclBufSize.c | 27 +-
src/map/scl/sclBuffer.c | 2 +
src/map/scl/sclDnsize.c | 27 +-
src/map/scl/sclLib.h | 1 +
src/map/scl/sclLoad.c | 11 +
src/map/scl/sclSize.c | 23 +-
src/map/scl/sclSize.h | 12 +-
src/map/scl/sclUpsize.c | 27 +-
src/map/scl/sclUtil.c | 96 +-
src/map/super/superWrite.c | 2 +-
src/misc/ext/ext.h | 57 -
src/misc/ext/module.make | 0
src/misc/extra/extra.h | 1 +
src/misc/extra/extraBdd.h | 4 +-
src/misc/extra/extraBddMisc.c | 310 +++-
src/misc/extra/extraUtilFile.c | 19 +
src/misc/extra/extraUtilMisc.c | 34 +
src/misc/extra/extraUtilPrime.c | 601 ++++++
src/misc/tim/tim.h | 3 +
src/misc/tim/timBox.c | 32 +
src/misc/tim/timMan.c | 133 +-
src/misc/util/abc_global.h | 36 +-
src/misc/util/utilNam.c | 106 +-
src/misc/util/utilNam.h | 2 +
src/misc/util/utilTruth.h | 298 +++
src/misc/vec/vecBit.h | 27 +-
src/misc/vec/vecFlt.h | 22 +
src/misc/vec/vecInt.h | 136 ++
src/misc/vec/vecMem.h | 8 +
src/misc/vec/vecPtr.h | 10 +
src/misc/vec/vecSet.h | 14 +
src/misc/vec/vecStr.h | 95 +
src/misc/vec/vecWec.h | 10 +
src/misc/vec/vecWrd.h | 29 +
src/opt/dau/dauGia.c | 9 +-
src/opt/dau/dauMerge.c | 2 +-
src/opt/ret/retCore.c | 2 +-
src/opt/ret/retIncrem.c | 2 +-
src/opt/sfm/sfm.h | 2 +-
src/opt/sfm/sfmCore.c | 9 +-
src/opt/sfm/sfmNtk.c | 3 +-
src/opt/sfm/sfmSat.c | 6 +-
src/opt/sfm/sfmWin.c | 36 +-
src/opt/sim/simSupp.c | 1206 ++++++------
src/proof/cec/cec.h | 3 +-
src/proof/cec/cecCec.c | 74 +-
src/proof/cec/cecCore.c | 11 +-
src/proof/cec/cecSplit.c | 62 +-
src/proof/int/intUtil.c | 4 +-
src/proof/pdr/pdrCore.c | 3 +-
src/sat/bmc/bmc.h | 7 +-
src/sat/bmc/bmcChain.c | 50 +-
src/sat/bmc/bmcEco.c | 6 -
src/sat/bmc/bmcFault.c | 391 +++-
src/sat/bmc/bmcFx.c | 727 ++++++++
src/sat/bmc/bmcICheck.c | 93 +-
src/sat/bmc/module.make | 1 +
src/sat/bsat/satSolver.h | 38 +-
src/sat/bsat/satSolver2.c | 2 +-
209 files changed, 32000 insertions(+), 2786 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/berkeley-abc.git
More information about the debian-science-commits
mailing list