riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

In GdsParser::xyToPath(), bad management of extension for PATHTYPE 4.

This commit is contained in:
Jean-Paul Chaput 2023-09-02 23:00:01 +02:00
parent 48bf2846e1
commit 53f50ee8ca
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crlcore/src/ccore/gds/GdsParser.cpp
View File

@ -1596,6 +1596,16 @@ namespace {
<< " width=" << DbU::getValueString(width) << " width=" << DbU::getValueString(width)
<< " bgnextn=" << DbU::getValueString(bgnextn) << " bgnextn=" << DbU::getValueString(bgnextn)
<< " endextn=" << DbU::getValueString(endextn) << endl; << " endextn=" << DbU::getValueString(endextn) << endl;
if (bgnextn < 0) {
cerr << Error( "GdsStream::xyToPath(): Negative BGNEXTN not supported yet (%s) layout will be incorrect."
, DbU::getValueString(bgnextn).c_str()
) << endl;
}
if (endextn < 0) {
cerr << Error( "GdsStream::xyToPath(): Negative ENDEXTN not supported yet (%s) layout will be incorrect."
, DbU::getValueString(endextn).c_str()
) << endl;
}
vector<Point> points; vector<Point> points;
vector<int32_t> coordinates = _record.getInt32s(); vector<int32_t> coordinates = _record.getInt32s();
@ -1640,13 +1650,13 @@ namespace {
if (points[0].getX() == points[1].getX()) { if (points[0].getX() == points[1].getX()) {
hWidthCap = width; hWidthCap = width;
vWidthCap = bgnextn + twoGrid; vWidthCap = bgnextn + twoGrid;
yadjust = -vWidthCap/2 + twoGrid; //yadjust = -vWidthCap/2 + twoGrid;
if (points[0].getY() > points[1].getY()) if (points[0].getY() > points[1].getY())
yadjust = -yadjust; yadjust = -yadjust;
} else { } else {
hWidthCap = bgnextn + twoGrid; hWidthCap = bgnextn + twoGrid;
vWidthCap = width; vWidthCap = width;
xadjust = -hWidthCap/2 + twoGrid; //xadjust = -hWidthCap/2 + twoGrid;
if (points[0].getX() > points[1].getX()) if (points[0].getX() > points[1].getX())
xadjust = -xadjust; xadjust = -xadjust;
} }
@ -1680,7 +1690,7 @@ namespace {
if (points[i-1].getX() == points[i].getX()) { if (points[i-1].getX() == points[i].getX()) {
hWidthCap = width; hWidthCap = width;
vWidthCap = endextn + twoGrid; vWidthCap = endextn + twoGrid;
yadjust = vWidthCap/2 - twoGrid; //yadjust = vWidthCap/2 + twoGrid;
if (points[i-1].getY() > points[i].getY()) if (points[i-1].getY() > points[i].getY())
yadjust = -yadjust; yadjust = -yadjust;
} else { } else {
@ -1688,7 +1698,7 @@ namespace {
<< " twoGrid=" << DbU::getValueString(twoGrid) << endl; << " twoGrid=" << DbU::getValueString(twoGrid) << endl;
hWidthCap = endextn + twoGrid; hWidthCap = endextn + twoGrid;
vWidthCap = width; vWidthCap = width;
xadjust = hWidthCap/2 - twoGrid; //xadjust = hWidthCap/2 - twoGrid;
if (points[i-1].getX() > points[i].getX()) if (points[i-1].getX() > points[i].getX())
xadjust = -xadjust; xadjust = -xadjust;
cdebug_log(101,0) << "xadjust=" << DbU::getValueString(xadjust) << endl; cdebug_log(101,0) << "xadjust=" << DbU::getValueString(xadjust) << endl;