Skip to content

Commit f470d08

Browse files
authored
Merge pull request #8084 from The-OpenROAD-Project-staging/secure-odb-assert-fix
odb: Changed the default hierachy delimiter ('\0' -> '/') in dbBlock and dbLib.
2 parents 9aaa999 + b9e39eb commit f470d08

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

src/cts/test/balance_levels.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION 5.8 ;
2-
DIVIDERCHAR "|" ;
2+
DIVIDERCHAR "/" ;
33
BUSBITCHARS "[]" ;
44
DESIGN multi_sink ;
55
UNITS DISTANCE MICRONS 2000 ;

src/gpl/test/clust02.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION 5.8 ;
2-
DIVIDERCHAR "|" ;
2+
DIVIDERCHAR "/" ;
33
BUSBITCHARS "[]" ;
44
DESIGN top ;
55
UNITS DISTANCE MICRONS 1000 ;

src/odb/include/odb/db.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ class dbBlock : public dbObject
13301330
static dbBlock* create(dbChip* chip,
13311331
const char* name,
13321332
dbTech* tech = nullptr,
1333-
char hier_delimiter = 0);
1333+
char hier_delimiter = '/');
13341334

13351335
///
13361336
/// Create a hierachical/child block. This block has no connectivity.
@@ -1340,7 +1340,7 @@ class dbBlock : public dbObject
13401340
static dbBlock* create(dbBlock* block,
13411341
const char* name,
13421342
dbTech* tech = nullptr,
1343-
char hier_delimiter = 0);
1343+
char hier_delimiter = '/');
13441344

13451345
///
13461346
/// Translate a database-id back to a pointer.
@@ -4990,7 +4990,7 @@ class dbLib : public dbObject
49904990
static dbLib* create(dbDatabase* db,
49914991
const char* name,
49924992
dbTech* tech,
4993-
char hierarchy_delimiter = 0);
4993+
char hierarchy_delimiter = '/');
49944994

49954995
///
49964996
/// Translate a database-id back to a pointer.

src/odb/src/db/dbBlock.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ _dbBlock::_dbBlock(_dbDatabase* db)
152152
_flags._spare_bits = 0;
153153
_def_units = 100;
154154
_dbu_per_micron = 1000;
155-
_hier_delimiter = 0;
155+
_hier_delimiter = '/';
156156
_left_bus_delimiter = 0;
157157
_right_bus_delimiter = 0;
158158
_num_ext_corners = 0;

src/odb/src/db/dbLib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ _dbLib::_dbLib(_dbDatabase* db)
9898
{
9999
_lef_units = 0;
100100
_dbu_per_micron = 1000;
101-
_hier_delimiter = 0;
101+
_hier_delimiter = '/';
102102
_left_bus_delimiter = 0;
103103
_right_bus_delimiter = 0;
104104
_spare = 0;

src/rsz/test/buffer_varying_lengths.defok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION 5.8 ;
2-
DIVIDERCHAR "|" ;
2+
DIVIDERCHAR "/" ;
33
BUSBITCHARS "[]" ;
44
DESIGN top ;
55
UNITS DISTANCE MICRONS 2000 ;

0 commit comments

Comments
 (0)