luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2078 from KLayout/bugfix/issue-2073 

Bugfix/issue 2073
This commit is contained in:
Matthias Köfferlein 2025-07-19 18:56:11 +02:00 committed by GitHub
parent d1dc885235 fbca4e6c18
commit f427f53a65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 359 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/db/db/dbCommonReader.cc
View File

@ -240,7 +240,7 @@ CommonReaderBase::cell_for_instance (db::Layout &layout, const std::string &cn)
}
void
CommonReaderBase::merge_cell (db::Layout &layout, db::cell_index_type target_cell_index, db::cell_index_type src_cell_index, bool with_meta, bool no_duplicate_instances) const
CommonReaderBase::merge_cell (db::Layout &layout, db::cell_index_type target_cell_index, db::cell_index_type src_cell_index, bool with_meta, bool no_duplicate_instances)
{
const db::Cell &src_cell = layout.cell (src_cell_index);
db::Cell &target_cell = layout.cell (target_cell_index);
@ -284,7 +284,7 @@ CommonReaderBase::merge_cell (db::Layout &layout, db::cell_index_type target_cel
}
void
CommonReaderBase::merge_cell_without_instances (db::Layout &layout, db::cell_index_type target_cell_index, db::cell_index_type src_cell_index, bool with_meta) const
CommonReaderBase::merge_cell_without_instances (db::Layout &layout, db::cell_index_type target_cell_index, db::cell_index_type src_cell_index, bool with_meta)
{
const db::Cell &src_cell = layout.cell (src_cell_index);
db::Cell &target_cell = layout.cell (target_cell_index);
@ -297,20 +297,21 @@ CommonReaderBase::merge_cell_without_instances (db::Layout &layout, db::cell_ind
}
// replace all instances of the new cell with the original one
layout.replace_instances_of (src_cell.cell_index (), target_cell.cell_index ());
layout.replace_instances_of (src_cell_index, target_cell_index);
// merge meta info
if (with_meta) {
auto ib = layout.begin_meta (src_cell.cell_index ());
auto ie = layout.end_meta (src_cell.cell_index ());
auto ib = layout.begin_meta (src_cell_index);
auto ie = layout.end_meta (src_cell_index);
for (auto i = ib; i != ie; ++i) {
layout.add_meta_info (target_cell.cell_index (), i->first, i->second);
layout.add_meta_info (target_cell_index, i->first, i->second);
}
}
layout.clear_meta (src_cell.cell_index ());
layout.clear_meta (src_cell_index);
// finally delete the new cell
layout.delete_cell (src_cell.cell_index ());
m_temp_cells.erase (src_cell_index);
layout.delete_cell (src_cell_index);
}
void

4
src/db/db/dbCommonReader.h
View File

@ -242,12 +242,12 @@ protected:
/**
* @brief Merge (and delete) the src_cell into target_cell
*/
void merge_cell (db::Layout &layout, db::cell_index_type target_cell_index, db::cell_index_type src_cell_index, bool with_meta, bool no_duplicate_instances) const;
void merge_cell (db::Layout &layout, db::cell_index_type target_cell_index, db::cell_index_type src_cell_index, bool with_meta, bool no_duplicate_instances);
/**
* @brief Merge (and delete) the src_cell into target_cell without instances
*/
void merge_cell_without_instances (db::Layout &layout, db::cell_index_type target_cell_index, db::cell_index_type src_cell_index, bool with_meta) const;
void merge_cell_without_instances (db::Layout &layout, db::cell_index_type target_cell_index, db::cell_index_type src_cell_index, bool with_meta);
/**
* @brief Gets the layer name map

2
src/db/db/dbTextWriter.cc
View File

@ -149,7 +149,7 @@ TextWriter::write_props (const db::Layout & /*layout*/, size_t prop_id)
const tl::Variant &name = p->first;
const tl::Variant &value = p->second;
if (name.is_long () || name.is_ulong ()) {
if (name.can_convert_to_long ()) {
*this << " {" << int (name.to_long ()) << " {" << value.to_string () << "}}" << endl_str ();
} else if (name.is_a_string ()) {
*this << " {{" << name.to_string () << "} {" << value.to_string () << "}}" << endl_str ();

414
src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc
View File

File diff suppressed because it is too large Load Diff

75
src/plugins/streamers/oasis/db_plugin/dbOASISReader.h
View File

@ -140,14 +140,14 @@ private:
modal_variable<db::cell_index_type> mm_placement_cell;
modal_variable<db::Coord> mm_placement_x;
modal_variable<db::Coord> mm_placement_y;
modal_variable<unsigned int> mm_layer;
modal_variable<unsigned int> mm_datatype;
modal_variable<unsigned int> mm_textlayer;
modal_variable<unsigned int> mm_texttype;
modal_variable<uint32_t> mm_layer;
modal_variable<uint32_t> mm_datatype;
modal_variable<uint32_t> mm_textlayer;
modal_variable<uint32_t> mm_texttype;
modal_variable<db::Coord> mm_text_x;
modal_variable<db::Coord> mm_text_y;
modal_variable<std::string> mm_text_string;
modal_variable<unsigned int> mm_text_string_id;
modal_variable<uint64_t> mm_text_string_id;
modal_variable<db::Coord> mm_geometry_x;
modal_variable<db::Coord> mm_geometry_y;
modal_variable<distance_type> mm_geometry_w;
@ -157,17 +157,17 @@ private:
modal_variable<db::Coord> mm_path_start_extension;
modal_variable<db::Coord> mm_path_end_extension;
modal_variable< std::vector<db::Point> > mm_path_point_list;
modal_variable<unsigned int> mm_ctrapezoid_type;
modal_variable<uint32_t> mm_ctrapezoid_type;
modal_variable<distance_type> mm_circle_radius;
modal_variable<db::property_names_id_type> mm_last_property_name;
modal_variable<bool> mm_last_property_is_sprop;
modal_variable<property_value_list> mm_last_value_list;
std::map <unsigned long, db::properties_id_type> m_cellname_properties;
std::map <unsigned long, std::string> m_textstrings;
std::map <unsigned long, const db::StringRef *> m_text_forward_references;
std::map <unsigned long, std::string> m_propstrings;
std::map <unsigned long, std::string> m_propnames;
std::map <uint64_t, db::properties_id_type> m_cellname_properties;
std::map <uint64_t, std::string> m_textstrings;
std::map <uint64_t, const db::StringRef *> m_text_forward_references;
std::map <uint64_t, std::string> m_propstrings;
std::map <uint64_t, std::string> m_propnames;
std::map <db::cell_index_type, std::vector<tl::Variant> > m_context_strings_per_cell;
@ -178,8 +178,8 @@ private:
bool m_read_properties;
bool m_read_all_properties;
std::map <unsigned long, db::property_names_id_type> m_propname_forward_references;
std::map <unsigned long, std::string> m_propvalue_forward_references;
std::map <uint64_t, db::property_names_id_type> m_propname_forward_references;
std::map <uint64_t, std::string> m_propvalue_forward_references;
std::map <db::properties_id_type, std::set<db::Shapes *> > m_forward_properties_for_shapes;
std::map <db::properties_id_type, std::set<db::Instances *> > m_forward_properties_for_instances;
std::map <db::cell_index_type, db::PropertiesSet> m_future_cell_properties;
@ -234,42 +234,35 @@ private:
}
}
long long get_long_long ();
unsigned long long get_ulong_long ();
long get_long ();
unsigned long get_ulong ();
unsigned long get_ulong_for_divider ();
int get_int ();
unsigned int get_uint ();
int64_t get_int64 ();
uint64_t get_uint64 ();
uint64_t get_uint64_for_divider ();
int32_t get_int32 ();
uint32_t get_uint32 ();
void get (long long &l)
void get (int64_t &l)
{
l = get_long_long ();
l = get_int64 ();
}
void get (unsigned long long &l)
void get_size (size_t &l)
{
l = get_ulong_long ();
l = get_uint64 ();
}
void get (long &l)
void get (uint64_t &l)
{
l = get_long ();
l = get_uint64 ();
}
void get (unsigned long &l)
void get (int32_t &l)
{
l = get_ulong ();
l = get_int32 ();
}
void get (int &l)
void get (uint32_t &l)
{
l = get_int ();
}
void get (unsigned int &l)
{
l = get_uint ();
l = get_uint32 ();
}
void get (double &d)
@ -280,12 +273,12 @@ private:
std::string get_str ();
void get_str (std::string &s);
double get_real ();
db::Vector get_gdelta (long grid = 1);
db::Vector get_3delta (long grid = 1);
db::Vector get_2delta (long grid = 1);
db::Coord get_coord (long grid = 1);
db::Coord get_ucoord (unsigned long grid = 1);
distance_type get_ucoord_as_distance (unsigned long grid = 1);
db::Vector get_gdelta (int64_t grid = 1);
db::Vector get_3delta (int64_t grid = 1);
db::Vector get_2delta (int64_t grid = 1);
db::Coord get_coord (int64_t grid = 1);
db::Coord get_ucoord (uint64_t grid = 1);
distance_type get_ucoord_as_distance (uint64_t grid = 1);
};
}

196
src/plugins/streamers/oasis/db_plugin/dbOASISWriter.cc
View File

@ -411,7 +411,7 @@ Compressor<Obj>::flush (db::OASISWriter *writer)
if (dd != displacements.end ()) {
dxy = xrep ? db::Vector (safe_diff (dd->x (), d->x ()), 0) : db::Vector (0, safe_diff (dd->y (), d->y ()));
while (dd != displacements.end () && *dd == dd[-1] + dxy) {
while (dd != displacements.end () && *dd == dd[-1] + dxy && nxy < std::numeric_limits<int>::max ()) {
++dd;
++nxy;
}
@ -453,7 +453,7 @@ Compressor<Obj>::flush (db::OASISWriter *writer)
db::Vector dxy = xrep ? db::Vector (safe_diff (dd->x (), d->x ()), 0) : db::Vector (0, safe_diff (dd->y (), d->y ()));
int nxy = 2;
while (dd != dwindow) {
while (dd != dwindow && nxy < std::numeric_limits<int>::max ()) {
disp_vector::iterator df = std::lower_bound (dd + 1, dwindow, *dd + dxy);
if (df == dwindow || *df != *dd + dxy) {
break;
@ -717,45 +717,17 @@ OASISWriter::write_bytes (const char *b, size_t n)
}
void
OASISWriter::write (long long n)
OASISWriter::write (int64_t n)
{
if (n < 0) {
write (((unsigned long long) (-n) << 1) | 1);
write (((uint64_t) (-n) << 1) | 1);
} else {
write ((unsigned long long) n << 1);
write ((uint64_t) n << 1);
}
}
void
OASISWriter::write (unsigned long long n)
{
char buffer [50];
char *bptr = buffer;
do {
unsigned char b = n & 0x7f;
n >>= 7;
if (n > 0) {
b |= 0x80;
}
*bptr++ = (char) b;
} while (n > 0);
write_bytes (buffer, bptr - buffer);
}
void
OASISWriter::write (long n)
{
if (n < 0) {
write (((unsigned long) (-n) << 1) | 1);
} else {
write ((unsigned long) n << 1);
}
}
void
OASISWriter::write (unsigned long n)
OASISWriter::write (uint64_t n)
{
char buffer [50];
char *bptr = buffer;
@ -775,15 +747,15 @@ OASISWriter::write (unsigned long n)
void
OASISWriter::write (float d)
{
if (fabs (d) >= 0.5 && fabs (floor (d + 0.5) - d) < 1e-6 && fabs (d) < double (std::numeric_limits<long>::max ())) {
if (fabs (d) >= 0.5 && fabs (floor (d + 0.5) - d) < 1e-6 && fabs (d) < double (std::numeric_limits<int64_t>::max ())) {
// whole number (negative or positive)
if (d < 0.0) {
write_byte (1);
write ((unsigned long) floor (-d + 0.5));
write ((uint64_t) floor (-d + 0.5));
} else {
write_byte (0);
write ((unsigned long) floor (d + 0.5));
write ((uint64_t) floor (d + 0.5));
}
} else {
@ -799,7 +771,7 @@ OASISWriter::write (float d)
f2i.d = d;
uint32_t i = f2i.i;
char b[sizeof (f2i.i)];
for (unsigned int n = 0; n < sizeof (f2i.i); n++) {
for (size_t n = 0; n < sizeof (f2i.i); n++) {
b[n] = char (i & 0xff);
i >>= 8;
}
@ -811,15 +783,15 @@ OASISWriter::write (float d)
void
OASISWriter::write (double d)
{
if (fabs (d) >= 0.5 && fabs (floor (d + 0.5) - d) < 1e-10 && fabs (d) < double (std::numeric_limits<long>::max ())) {
if (fabs (d) >= 0.5 && fabs (floor (d + 0.5) - d) < 1e-10 && fabs (d) < double (std::numeric_limits<int64_t>::max ())) {
// whole number (negative or positive)
if (d < 0.0) {
write_byte (1);
write ((unsigned long) floor (-d + 0.5));
write ((uint64_t) floor (-d + 0.5));
} else {
write_byte (0);
write ((unsigned long) floor (d + 0.5));
write ((uint64_t) floor (d + 0.5));
}
} else {
@ -848,7 +820,7 @@ void
OASISWriter::write_bstring (const char *s)
{
size_t l = strlen (s);
write (l);
write ((uint64_t) l);
write_bytes (s, l);
}
@ -867,7 +839,7 @@ void
OASISWriter::write_astring (const char *s)
{
std::string nstr = make_astring (s);
write (nstr.size ());
write ((uint64_t) nstr.size ());
write_bytes (nstr.c_str (), nstr.size ());
}
@ -886,7 +858,7 @@ void
OASISWriter::write_nstring (const char *s)
{
std::string nstr = make_nstring (s);
write (nstr.size ());
write ((uint64_t) nstr.size ());
write_bytes (nstr.c_str (), nstr.size ());
}
@ -903,8 +875,8 @@ OASISWriter::write_gdelta (const db::Vector &p, double sf)
if (x == -y || x == y || x == 0 || y == 0) {
unsigned long long dir = 0;
unsigned long long l = 0;
uint64_t dir = 0;
uint64_t l = 0;
if (x > 0) {
l = x;
@ -938,11 +910,11 @@ OASISWriter::write_gdelta (const db::Vector &p, double sf)
} else {
unsigned long long d;
uint64_t d;
if (x < 0) {
d = ((unsigned long long) -x << 2) | 3;
d = ((uint64_t) -x << 2) | 3;
} else {
d = ((unsigned long long) x << 2) | 1;
d = ((uint64_t) x << 2) | 1;
}
write (d);
write (y);
@ -1090,8 +1062,8 @@ OASISWriter::end_cblock ()
// RFC1951 compression:
write_byte (0);
write (m_cblock_buffer.size ());
write (m_cblock_compressed.size ());
write ((uint64_t) m_cblock_buffer.size ());
write ((uint64_t) m_cblock_compressed.size ());
write_bytes (m_cblock_compressed.data (), m_cblock_compressed.size ());
@ -1158,7 +1130,7 @@ OASISWriter::write_propname_table (size_t &propnames_table_pos, const std::vecto
{
// write the property names collected so far in the order of the ID's.
std::vector<std::pair<unsigned long, std::string> > rev_pn;
std::vector<std::pair<uint64_t, std::string> > rev_pn;
rev_pn.reserve (m_propnames.size ());
for (auto p = m_propnames.begin (); p != m_propnames.end (); ++p) {
rev_pn.push_back (std::make_pair (p->second, p->first));
@ -1166,7 +1138,7 @@ OASISWriter::write_propname_table (size_t &propnames_table_pos, const std::vecto
std::sort (rev_pn.begin (), rev_pn.end ());
for (auto p = rev_pn.begin (); p != rev_pn.end (); ++p) {
tl_assert (p->first == (unsigned long)(p - rev_pn.begin ()));
tl_assert (p->first == (uint64_t)(p - rev_pn.begin ()));
begin_table (propnames_table_pos);
write_record_id (7);
write_nstring (p->second.c_str ());
@ -1236,7 +1208,7 @@ OASISWriter::write_propstring_table (size_t &propstrings_table_pos, const std::v
{
// write the property strings collected so far in the order of the ID's.
std::vector<std::pair<unsigned long, const std::string *> > rev_ps;
std::vector<std::pair<uint64_t, const std::string *> > rev_ps;
rev_ps.reserve (m_propstrings.size ());
for (auto p = m_propstrings.begin (); p != m_propstrings.end (); ++p) {
rev_ps.push_back (std::make_pair (p->second, &p->first));
@ -1246,7 +1218,7 @@ OASISWriter::write_propstring_table (size_t &propstrings_table_pos, const std::v
tl_assert (rev_ps.size () == size_t (m_propstring_id));
for (auto p = rev_ps.begin (); p != rev_ps.end (); ++p) {
tl_assert (p->first == (unsigned long)(p - rev_ps.begin ()));
tl_assert (p->first == (uint64_t)(p - rev_ps.begin ()));
begin_table (propstrings_table_pos);
write_record_id (9);
write_bstring (p->second->c_str ());
@ -1336,7 +1308,7 @@ OASISWriter::write_cellname_table (size_t &cellnames_table_pos, const std::vecto
write_record_id (sequential ? 3 : 4);
write_nstring (layout.cell_name (*cell));
if (! sequential) {
write ((unsigned long) *cell);
write ((uint64_t) *cell);
}
if (m_options.write_std_properties >= 1) {
@ -1391,7 +1363,7 @@ OASISWriter::write_textstring_table (size_t &textstrings_table_pos, const std::v
// write present text strings
// collect present strings by ID
std::vector<std::pair<unsigned long, const std::string *> > rev_ts;
std::vector<std::pair<uint64_t, const std::string *> > rev_ts;
rev_ts.reserve (m_textstrings.size ());
for (auto p = m_textstrings.begin (); p != m_textstrings.end (); ++p) {
rev_ts.push_back (std::make_pair (p->second, &p->first));
@ -1401,7 +1373,7 @@ OASISWriter::write_textstring_table (size_t &textstrings_table_pos, const std::v
tl_assert (rev_ts.size () == size_t (m_textstring_id));
for (auto t = rev_ts.begin (); t != rev_ts.end (); ++t) {
tl_assert (t->first == (unsigned long)(t - rev_ts.begin ()));
tl_assert (t->first == (uint64_t)(t - rev_ts.begin ()));
begin_table (textstrings_table_pos);
write_record_id (5);
write_nstring (t->second->c_str ());
@ -1444,16 +1416,16 @@ OASISWriter::write_layername_table (size_t &layernames_table_pos, const std::vec
write_record_id (11);
write_nstring (l->second.name.c_str ());
write_byte (3);
write ((unsigned long) l->second.layer);
write ((uint64_t) l->second.layer);
write_byte (3);
write ((unsigned long) l->second.datatype);
write ((uint64_t) l->second.datatype);
write_record_id (12);
write_nstring (l->second.name.c_str ());
write_byte (3);
write ((unsigned long) l->second.layer);
write ((uint64_t) l->second.layer);
write_byte (3);
write ((unsigned long) l->second.datatype);
write ((uint64_t) l->second.datatype);
m_progress.set (mp_stream->pos ());
@ -1679,7 +1651,7 @@ OASISWriter::write (db::Layout &layout, tl::OutputStream &stream, const db::Save
cell_positions.insert (std::make_pair (*cell, mp_stream->pos ()));
write_record_id (13); // CELL
write ((unsigned long) *cell);
write ((uint64_t) *cell);
reset_modal_variables ();
@ -1696,8 +1668,8 @@ OASISWriter::write (db::Layout &layout, tl::OutputStream &stream, const db::Save
write_record_id (28);
write_byte (char (0xf6));
unsigned long pnid = 0;
std::map <std::string, unsigned long>::const_iterator pni = m_propnames.find (klayout_context_name);
uint64_t pnid = 0;
std::map <std::string, uint64_t>::const_iterator pni = m_propnames.find (klayout_context_name);
if (pni == m_propnames.end ()) {
pnid = m_propname_id++;
m_propnames.insert (std::make_pair (klayout_context_name, pnid));
@ -1706,12 +1678,12 @@ OASISWriter::write (db::Layout &layout, tl::OutputStream &stream, const db::Save
}
write (pnid);
write ((unsigned long) context_prop_strings.size ());
write ((uint64_t) context_prop_strings.size ());
for (std::vector <std::string>::const_iterator c = context_prop_strings.begin (); c != context_prop_strings.end (); ++c) {
write_byte (14); // b-string by reference number
unsigned long psid = 0;
std::map <std::string, unsigned long>::const_iterator psi = m_propstrings.find (*c);
uint64_t psid = 0;
std::map <std::string, uint64_t>::const_iterator psi = m_propstrings.find (*c);
if (psi == m_propstrings.end ()) {
psid = m_propstring_id++;
m_propstrings.insert (std::make_pair (*c, psid)).second;
@ -1795,23 +1767,23 @@ OASISWriter::write (db::Layout &layout, tl::OutputStream &stream, const db::Save
// cellnames
write_byte (1);
write (cellnames_table_pos);
write ((uint64_t) cellnames_table_pos);
// textstrings
write_byte (1);
write (textstrings_table_pos);
write ((uint64_t) textstrings_table_pos);
// propnames
write_byte (1);
write (propnames_table_pos);
write ((uint64_t) propnames_table_pos);
// propstrings
write_byte (1);
write (propstrings_table_pos);
write ((uint64_t) propstrings_table_pos);
// layernames
write_byte (1);
write (layernames_table_pos);
write ((uint64_t) layernames_table_pos);
// xnames (not used)
write_byte (1);
@ -1875,11 +1847,11 @@ OASISWriter::write (const Repetition &rep)
if (g <= 1) {
write_byte (10);
write (iterated->size () - 1);
write ((uint64_t) iterated->size () - 1);
g = 1;
} else {
write_byte (11);
write (iterated->size () - 1);
write ((uint64_t) iterated->size () - 1);
write_ucoord (g, 1.0);
}
@ -1909,39 +1881,39 @@ OASISWriter::write (const Repetition &rep)
if (b.x () == 0 && b.y () >= 0) {
write_byte (3);
write (bmax - 2);
write ((uint64_t) bmax - 2);
write_ucoord (b.y ());
} else if (b.y () == 0 && b.x () >= 0) {
write_byte (2);
write (bmax - 2);
write ((uint64_t) bmax - 2);
write_ucoord (b.x ());
} else {
write_byte (9);
write (bmax - 2);
write ((uint64_t) bmax - 2);
write_gdelta (b);
}
} else if (b.x () == 0 && b.y () >= 0 && a.y () == 0 && a.x () >= 0) {
write_byte (1);
write (amax - 2);
write (bmax - 2);
write ((uint64_t) amax - 2);
write ((uint64_t) bmax - 2);
write_ucoord (a.x ());
write_ucoord (b.y ());
} else if (b.y () == 0 && b.x () >= 0 && a.x () == 0 && a.y () >= 0) {
write_byte (1);
write (bmax - 2);
write (amax - 2);
write ((uint64_t) bmax - 2);
write ((uint64_t) amax - 2);
write_ucoord (b.x ());
write_ucoord (a.y ());
} else {
write_byte (8);
write (amax - 2);
write (bmax - 2);
write ((uint64_t) amax - 2);
write ((uint64_t) bmax - 2);
write_gdelta (a);
write_gdelta (b);
@ -1985,7 +1957,7 @@ OASISWriter::write_inst_with_rep (const db::CellInstArray &inst, db::properties_
if (info & 0x80) {
mm_placement_cell = inst.object ().cell_index ();
write ((unsigned long) mm_placement_cell.get ());
write ((uint64_t) mm_placement_cell.get ());
}
if (inst.is_complex ()) {
@ -2191,7 +2163,7 @@ OASISWriter::write_property_def (const char *name_str, const std::vector<tl::Var
if (! same_name) {
std::map <std::string, unsigned long>::const_iterator pni = m_propnames.find (name_str);
std::map <std::string, uint64_t>::const_iterator pni = m_propnames.find (name_str);
// In strict mode always write property ID's: before we have issued the table we can
// create new ID's.
@ -2219,11 +2191,11 @@ OASISWriter::write_property_def (const char *name_str, const std::vector<tl::Var
if (! same_value) {
if (pvl.size () >= 15) {
write ((unsigned long) pvl.size ());
write ((uint64_t) pvl.size ());
}
// write property values
for (unsigned long i = 0; i < pvl.size (); ++i) {
for (uint64_t i = 0; i < pvl.size (); ++i) {
const tl::Variant &v = pvl[i];
@ -2234,27 +2206,27 @@ OASISWriter::write_property_def (const char *name_str, const std::vector<tl::Var
} else if (v.is_longlong ()) {
write_byte (9);
write (v.to_longlong ());
write ((int64_t) v.to_longlong ());
} else if (v.is_ulonglong ()) {
write_byte (8);
write (v.to_ulonglong ());
write ((uint64_t) v.to_ulonglong ());
} else if (v.is_long ()) {
write_byte (9);
write (v.to_long ());
write ((int64_t) v.to_long ());
} else if (v.is_ulong ()) {
write_byte (8);
write (v.to_ulong ());
write ((uint64_t) v.to_ulong ());
} else {
const char *pvs = v.to_string ();
std::map <std::string, unsigned long>::const_iterator pvi = m_propstrings.find (pvs);
std::map <std::string, uint64_t>::const_iterator pvi = m_propstrings.find (pvs);
// In strict mode always write property string ID's: before we have issued the table we can
// create new ID's.
@ -2335,7 +2307,7 @@ OASISWriter::write_pointlist (const std::vector<db::Vector> &pointlist, bool for
// manhattan pointlist
write_byte (type);
size_t implicit = for_polygons ? 1 : 0;
write ((unsigned long) (pointlist.size () - implicit));
write ((uint64_t) (pointlist.size () - implicit));
db::Vector plast (0, 0);
for (std::vector<db::Vector>::const_iterator p = pointlist.begin (); p != pointlist.end () - implicit; ++p) {
@ -2353,7 +2325,7 @@ OASISWriter::write_pointlist (const std::vector<db::Vector> &pointlist, bool for
// generic pointlist
write_byte (4);
write ((unsigned long) pointlist.size ());
write ((uint64_t) pointlist.size ());
db::Vector plast (0, 0);
if (m_sf == 1.0) {
for (std::vector<db::Vector>::const_iterator p = pointlist.begin (); p != pointlist.end (); ++p) {
@ -2378,8 +2350,8 @@ OASISWriter::write (const db::Text &text, db::properties_id_type prop_id, const
db::Trans trans = text.trans ();
unsigned long text_id = 0;
std::map <std::string, unsigned long>::const_iterator ts = m_textstrings.find (text.string ());
uint64_t text_id = 0;
std::map <std::string, uint64_t>::const_iterator ts = m_textstrings.find (text.string ());
if (ts == m_textstrings.end ()) {
text_id = m_textstring_id++;
m_textstrings.insert (std::make_pair (text.string (), text_id));
@ -2412,15 +2384,15 @@ OASISWriter::write (const db::Text &text, db::properties_id_type prop_id, const
write_byte (info);
if (info & 0x40) {
mm_text_string = text.string ();
write ((unsigned long) text_id);
write ((uint64_t) text_id);
}
if (info & 0x01) {
mm_textlayer = m_layer;
write ((unsigned long) m_layer);
write ((uint64_t) m_layer);
}
if (info & 0x02) {
mm_texttype = m_datatype;
write ((unsigned long) m_datatype);
write ((uint64_t) m_datatype);
}
if (info & 0x10) {
mm_text_x = trans.disp ().x ();
@ -2496,11 +2468,11 @@ OASISWriter::write (const db::SimplePolygon &polygon, db::properties_id_type pro
if (info & 0x01) {
mm_layer = m_layer;
write ((unsigned long) m_layer);
write ((uint64_t) m_layer);
}
if (info & 0x02) {
mm_datatype = m_datatype;
write ((unsigned long) m_datatype);
write ((uint64_t) m_datatype);
}
if (info & 0x20) {
mm_polygon_point_list.swap (m_pointlist);
@ -2597,11 +2569,11 @@ OASISWriter::write (const db::Polygon &polygon, db::properties_id_type prop_id,
if (info & 0x01) {
mm_layer = m_layer;
write ((unsigned long) m_layer);
write ((uint64_t) m_layer);
}
if (info & 0x02) {
mm_datatype = m_datatype;
write ((unsigned long) m_datatype);
write ((uint64_t) m_datatype);
}
if (info & 0x20) {
mm_polygon_point_list.swap (m_pointlist);
@ -2667,11 +2639,11 @@ OASISWriter::write (const db::Box &box, db::properties_id_type prop_id, const db
if (info & 0x01) {
mm_layer = m_layer;
write ((unsigned long) m_layer);
write ((uint64_t) m_layer);
}
if (info & 0x02) {
mm_datatype = m_datatype;
write ((unsigned long) m_datatype);
write ((uint64_t) m_datatype);
}
mm_geometry_w = box.width ();
@ -2772,11 +2744,11 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const
if (info & 0x01) {
mm_layer = m_layer;
write ((unsigned long) m_layer);
write ((uint64_t) m_layer);
}
if (info & 0x02) {
mm_datatype = m_datatype;
write ((unsigned long) m_datatype);
write ((uint64_t) m_datatype);
}
if (info & 0x20) {
mm_circle_radius = hw;
@ -2853,11 +2825,11 @@ OASISWriter::write (const db::Path &path, db::properties_id_type prop_id, const
if (info & 0x01) {
mm_layer = m_layer;
write ((unsigned long) m_layer);
write ((uint64_t) m_layer);
}
if (info & 0x02) {
mm_datatype = m_datatype;
write ((unsigned long) m_datatype);
write ((uint64_t) m_datatype);
}
if (info & 0x40) {
mm_path_halfwidth = hw;
@ -3046,11 +3018,11 @@ OASISWriter::write (const db::Edge &edge, db::properties_id_type prop_id, const
if (info & 0x01) {
mm_layer = m_layer;
write ((unsigned long) m_layer);
write ((uint64_t) m_layer);
}
if (info & 0x02) {
mm_datatype = m_datatype;
write ((unsigned long) m_datatype);
write ((uint64_t) m_datatype);
}
if (info & 0x40) {
mm_path_halfwidth = 0;

40
src/plugins/streamers/oasis/db_plugin/dbOASISWriter.h
View File

@ -208,14 +208,14 @@ private:
tl::OutputMemoryStream m_cblock_buffer;
tl::OutputMemoryStream m_cblock_compressed;
bool m_in_cblock;
unsigned long m_propname_id;
unsigned long m_propstring_id;
unsigned long m_textstring_id;
uint64_t m_propname_id;
uint64_t m_propstring_id;
uint64_t m_textstring_id;
bool m_proptables_written;
std::map <std::string, unsigned long> m_textstrings;
std::map <std::string, unsigned long> m_propnames;
std::map <std::string, unsigned long> m_propstrings;
std::map <std::string, uint64_t> m_textstrings;
std::map <std::string, uint64_t> m_propnames;
std::map <std::string, uint64_t> m_propstrings;
typedef std::vector<tl::Variant> property_value_list;
@ -223,23 +223,23 @@ private:
modal_variable<db::cell_index_type> mm_placement_cell;
modal_variable<db::Coord> mm_placement_x;
modal_variable<db::Coord> mm_placement_y;
modal_variable<unsigned int> mm_layer;
modal_variable<unsigned int> mm_datatype;
modal_variable<unsigned int> mm_textlayer;
modal_variable<unsigned int> mm_texttype;
modal_variable<uint32_t> mm_layer;
modal_variable<uint32_t> mm_datatype;
modal_variable<uint32_t> mm_textlayer;
modal_variable<uint32_t> mm_texttype;
modal_variable<db::Coord> mm_text_x;
modal_variable<db::Coord> mm_text_y;
modal_variable<std::string> mm_text_string;
modal_variable<db::Coord> mm_geometry_x;
modal_variable<db::Coord> mm_geometry_y;
modal_variable<db::Coord> mm_geometry_w;
modal_variable<db::Coord> mm_geometry_h;
modal_variable<db::coord_traits<db::Coord>::distance_type> mm_geometry_w;
modal_variable<db::coord_traits<db::Coord>::distance_type> mm_geometry_h;
modal_variable< std::vector<db::Vector> > mm_polygon_point_list;
modal_variable<db::Coord> mm_path_halfwidth;
modal_variable<db::Coord> mm_path_start_extension;
modal_variable<db::Coord> mm_path_end_extension;
modal_variable< std::vector<db::Vector> > mm_path_point_list;
modal_variable<unsigned int> mm_ctrapezoid_type;
modal_variable<uint32_t> mm_ctrapezoid_type;
modal_variable<db::Coord> mm_circle_radius;
modal_variable<std::string> mm_last_property_name;
modal_variable<bool> mm_last_property_is_sprop;
@ -273,19 +273,17 @@ private:
void write (double d);
void write (float d);
void write (long n);
void write (unsigned long n);
void write (long long n);
void write (unsigned long long n);
void write (int64_t n);
void write (uint64_t n);
void write (int n)
void write (int32_t n)
{
write (long (n));
write (int64_t (n));
}
void write (unsigned int n)
void write (uint32_t n)
{
write ((unsigned long) (n));
write ((uint64_t) (n));
}
void write (const Repetition &rep);

21
src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc
View File

@ -679,3 +679,24 @@ TEST(DuplicateCellname)
EXPECT_EQ (ex.msg ().find ("Same cell name TOP, but different IDs: 3 and 0 (position=1070, cell=)"), size_t (0));
}
}
TEST(BlendCrash)
{
db::Manager m (false);
db::Layout layout (&m);
{
tl::InputStream file (tl::testdata () + "/oasis/blend_crash1.oas");
db::OASISReader reader (file);
reader.read (layout);
}
{
tl::InputStream file (tl::testdata () + "/oasis/blend_crash2.oas");
db::OASISReader reader (file);
reader.read (layout);
}
std::string fn_au (tl::testdata () + "/oasis/blend_crash_au.gds.gz");
db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1);
}

BIN
testdata/oasis/blend_crash1.oas vendored Normal file
View File

Binary file not shown.

BIN
testdata/oasis/blend_crash2.oas vendored Normal file
View File

Binary file not shown.

BIN
testdata/oasis/blend_crash_au.gds.gz vendored Normal file
View File

Binary file not shown.