diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in index 92e0def8..42b60d71 100644 --- a/bootstrap/coriolis2.spec.in +++ b/bootstrap/coriolis2.spec.in @@ -115,7 +115,7 @@ Development files for the Coriolis 2 package. %defattr(-,root,root,-) %doc %{_datadir}/doc/coriolis2 %dir %{_sysconfdir}/coriolis2 -%dir %{coriolisTop}/share/coriolis2/flute-2.4 +%dir %{coriolisTop}/share/coriolis2/flute-3.1 %dir %{coriolisTop}/bin %dir %{coriolisTop}/%{_lib} %dir %{coriolisTop}/%{python_sitedir} @@ -140,7 +140,7 @@ Development files for the Coriolis 2 package. %config(noreplace) %{_sysconfdir}/coriolis2/*.sh %config(noreplace) %{_sysconfdir}/coriolis2/*.py* %config(noreplace) %{_sysconfdir}/coriolis2/stratus.vim -%config(noreplace) %{coriolisTop}/share/coriolis2/flute-2.4/*.dat +%config(noreplace) %{coriolisTop}/share/coriolis2/flute-3.1/*.dat %files devel diff --git a/bootstrap/debian/copyright b/bootstrap/debian/copyright index d7a7b5bb..e6fb3918 100644 --- a/bootstrap/debian/copyright +++ b/bootstrap/debian/copyright @@ -27,7 +27,7 @@ Files: hurricane/src/hurricane/* Copyright: 2000-2011 Bull S.A. License: GPL-2 -Files: knik/src/flute-2.4/* +Files: knik/src/flute-3.1/* Copyright: 2004-2011 Chris C. N. Chu License: FLUTE-License diff --git a/crlcore/etc/CMakeLists.txt b/crlcore/etc/CMakeLists.txt index 8ef87b31..fa4665f1 100644 --- a/crlcore/etc/CMakeLists.txt +++ b/crlcore/etc/CMakeLists.txt @@ -7,13 +7,3 @@ install ( DIRECTORY scmos_deep_018 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( DIRECTORY scn6m_deep_09 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( DIRECTORY hcmos9gp DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - - install ( FILES environment.alliance.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.symbolic.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.cmos130.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.cmos65.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.ams035.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.freePDK45.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES technology.fake.s2r.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES display.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( FILES tools.configuration.xml DESTINATION ${SYS_CONF_DIR}/coriolis2 ) diff --git a/crlcore/etc/c35b4/technology.conf b/crlcore/etc/c35b4/technology.conf new file mode 100644 index 00000000..16833827 --- /dev/null +++ b/crlcore/etc/c35b4/technology.conf @@ -0,0 +1,25 @@ +# -*- Mode:Python; explicit-buffer-name: "technology.conf" -*- +# +# AMS 0.35 microns. + +technoConfig = { 'name' : 'c35b4' + , 'gridValue' : 0.025 + , 'gridUnit' : DbU.UnitPowerMicro + , 'gridsPerLambda': 24 + } + +realLayersTable = \ + ( ("nWell" , "NTUB" , 5) + , ("nImplant", "NPLUS" , 23) + , ("pImplant", "PPLUS" , 24) + , ("active" , "DIFF" , 10) + , ("poly" , "POLY1" , 20) + , ("cut0" , "CONT" , 34) + , ("metal1" , "MET1" , 35) + , ("cut1" , "VIA1" , 36) + , ("metal2" , "MET2" , 37) + , ("cut2" , "VIA2" , 38) + , ("metal3" , "MET3" , 39) + , ("cut3" , "VIA3" , 41) + , ("metal4" , "MET4" , 42) + ) diff --git a/crlcore/etc/cmos065/technology.conf b/crlcore/etc/cmos065/technology.conf new file mode 100644 index 00000000..308c8479 --- /dev/null +++ b/crlcore/etc/cmos065/technology.conf @@ -0,0 +1,27 @@ +# -*- Mode:Python; explicit-buffer-name: "technology.conf" -*- + +technoConfig = { 'name' : 'cmos065' + , 'gridValue' : 0.005 + , 'gridUnit' : DbU.UnitPowerMicro + , 'gridsPerLambda': 24 + } + +realLayersTable = \ + ( ("nWell" , "NWELL" , 3) + , ("nImplant", "NPLUS" , 26) + , ("pImplant", "PPLUS" , 25) + , ("active" , "ACTIVE" , 6) + , ("poly" , "POLY" , 17) + , ("cut0" , "C0" , 30) + , ("metal1" , "M1" , 31) + , ("cut1" , "VIA1X" , 51) + , ("metal2" , "M2X" , 32) + , ("cut2" , "VIA2X" , 52) + , ("metal3" , "M3X" , 33) + , ("cut3" , "VIA3X" , 53) + , ("metal4" , "M4X" , 34) + , ("cut4" , "VIA4X" , 54) + , ("metal5" , "M5X" , 35) + , ("cut5" , "VIA5X" , 55) + , ("metal6" , "M6X" , 36) + ) diff --git a/crlcore/etc/display.xml b/crlcore/etc/display.xml deleted file mode 100644 index 1f0d85b5..00000000 --- a/crlcore/etc/display.xml +++ /dev/null @@ -1,324 +0,0 @@ - - - - - Alliance Coriolis Look - black background - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - Alliance.Coriolis [black] - Alliance Coriolis Look - white background - - - - - - - - - - - - - - - - - - Alliance Standard Look - black background - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Alliance.Classic [black] - Alliance Standard Look - white background - - - - - - - - - - - - - - - - - - Alliance.Coriolis [black] - Ispd Global Route Look - black background - - - - - - - - - - - - - Alliance.Coriolis [black] - Useful for debugging layout - black background - - - - - - - - - - - - - - - - - - - - - - - - - - - - Layout Design - Useful for debugging layout - white background - - - - - - - - - - - - - - Coriolis Look for Printers - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crlcore/etc/environment.alliance.xml b/crlcore/etc/environment.alliance.xml deleted file mode 100644 index 71afb4b5..00000000 --- a/crlcore/etc/environment.alliance.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - ${CORIOLIS_TOP}/etc/coriolis2/technology.symbolic.xml - - - ${CORIOLIS_TOP}/etc/coriolis2/technology.cmos130.s2r.xml - - - ${CORIOLIS_TOP}/etc/coriolis2/display.xml - - - - CATAL - - . - - - ${CELL_TOP}/cells/sxlib - ${CELL_TOP}/cells/dp_sxlib - ${CELL_TOP}/cells/ramlib - ${CELL_TOP}/cells/romlib - ${CELL_TOP}/cells/rflib - ${CELL_TOP}/cells/rf2lib - ${CELL_TOP}/cells/pxlib - - - - 100 - - vst - ap - - - vst - ap - - - - vdd - vss - ^ck.* - ^blockageNet$ - - diff --git a/crlcore/etc/technology.ams035.s2r.xml b/crlcore/etc/technology.ams035.s2r.xml deleted file mode 100644 index 62f8d678..00000000 --- a/crlcore/etc/technology.ams035.s2r.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - ams035 - - - - - - - - - - - - - - - - - - - - - diff --git a/crlcore/etc/technology.cmos130.s2r.xml b/crlcore/etc/technology.cmos130.s2r.xml deleted file mode 100644 index 0a38882e..00000000 --- a/crlcore/etc/technology.cmos130.s2r.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - hcmos9 - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crlcore/etc/technology.cmos65.s2r.xml b/crlcore/etc/technology.cmos65.s2r.xml deleted file mode 100644 index 553df8e1..00000000 --- a/crlcore/etc/technology.cmos65.s2r.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - cmos065 - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crlcore/etc/technology.fake.s2r.xml b/crlcore/etc/technology.fake.s2r.xml deleted file mode 100644 index e3d2308d..00000000 --- a/crlcore/etc/technology.fake.s2r.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - fake - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crlcore/etc/technology.freePDK45.s2r.xml b/crlcore/etc/technology.freePDK45.s2r.xml deleted file mode 100644 index f19e13a3..00000000 --- a/crlcore/etc/technology.freePDK45.s2r.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - freePDK45 - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crlcore/etc/technology.symbolic.xml b/crlcore/etc/technology.symbolic.xml deleted file mode 100644 index d62b5af2..00000000 --- a/crlcore/etc/technology.symbolic.xml +++ /dev/null @@ -1,328 +0,0 @@ - - - Alliance - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - 1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crlcore/etc/tools.configuration.xml b/crlcore/etc/tools.configuration.xml deleted file mode 100644 index 61171222..00000000 --- a/crlcore/etc/tools.configuration.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hurricane/src/viewer/CellWidget.cpp b/hurricane/src/viewer/CellWidget.cpp index bca098a8..c735b8f4 100644 --- a/hurricane/src/viewer/CellWidget.cpp +++ b/hurricane/src/viewer/CellWidget.cpp @@ -370,7 +370,7 @@ namespace Hurricane { #if (QT_VERSION == QT_VERSION_CHECK(4,8,5)) //cerr << "CellWidget::DrawingPlanes::setPen() Buggy 4.8.5 Qt, diagonal lines may appears..." << endl; - _normalPen.setWidth( 0 ); + _normalPen.setWidth( 2 ); _linePen.setWidth( 2 ); #else _linePen.setWidth( 1 ); diff --git a/knik/src/flute-3.1/src/flute.cpp b/knik/src/flute-3.1/src/flute.cpp index ebb734ef..6e448358 100644 --- a/knik/src/flute-3.1/src/flute.cpp +++ b/knik/src/flute-3.1/src/flute.cpp @@ -83,7 +83,7 @@ void readLUT() Environment* env = AllianceFramework::get()->getEnvironment(); string POWVFILE_string = env->getCORIOLIS_TOP(); - POWVFILE_string += "/share/coriolis2/flute-2.4/"; + POWVFILE_string += "/share/coriolis2/flute-3.1/"; POWVFILE_string += POWVFILE; fpwv=fopen(POWVFILE_string.c_str(), "r"); @@ -95,7 +95,7 @@ void readLUT() #if ROUTING==1 string POSTFILE_string = env->getCORIOLIS_TOP(); - POSTFILE_string += "/share/coriolis2/flute-2.4/"; + POSTFILE_string += "/share/coriolis2/flute-3.1/"; POSTFILE_string += POSTFILE; fprt=fopen(POSTFILE_string.c_str(), "r"); if (fprt == NULL)