Merge pull request #145 from openroadie/master

setTopInstance/deleteTopInstance back to being public
This commit is contained in:
Harsh Vardhan 2023-03-14 11:11:21 -07:00 committed by GitHub
commit 20805c83cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions

View File

@ -230,6 +230,10 @@ public:
void setLinkFunc(LinkNetworkFunc *link) override;
static ObjectId nextObjectId();
// Used by external tools.
void setTopInstance(Instance *top_inst);
void deleteTopInstance();
using Network::netIterator;
using Network::findPin;
using Network::findNet;
@ -240,8 +244,6 @@ public:
using Network::isLeaf;
protected:
void setTopInstance(Instance *top_inst);
void deleteTopInstance();
void addLibrary(ConcreteLibrary *library);
void setName(const char *name);
void clearConstantNets();

View File

@ -253,10 +253,8 @@ ReportPath::setDigits(int digits)
{
digits_ = digits;
if (plus_zero_) {
stringDelete(plus_zero_);
stringDelete(minus_zero_);
}
stringDelete(plus_zero_);
stringDelete(minus_zero_);
minus_zero_ = stringPrint("-%.*f", digits_, 0.0);
plus_zero_ = stringPrint("%.*f", digits_, 0.0);
}
@ -3164,11 +3162,16 @@ ReportPath::reportField(float value,
reportFieldBlank(field, line);
else {
Unit *unit = field->unit();
const char *value_str = (unit)
? unit->asString(value, digits_)
if (unit) {
const char *value_str = unit->asString(value, digits_);
reportField(value_str, field, line);
}
else {
// fanout
: stringPrintTmp("%.0f", value);
reportField(value_str, field, line);
string value_str;
stringPrint(value_str, "%.0f", value);
reportField(value_str.c_str(), field, line);
}
}
}