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

WIP: bug fixing, tested binary format with protoscope

This commit is contained in:
Matthias Koefferlein 2024-08-11 14:42:34 +02:00
parent f6da5e11c6
commit ee06ac2f7a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tl/tl/tlProtocolBuffer.cc
View File

@ -121,9 +121,10 @@ ProtocolBufferReader::read (uint32_t &ui32)
} else { } else {
ui32 = 0; ui32 = 0;
for (unsigned int i = 0; i < sizeof (ui32) && ! at_end (); ++i) { const char *cp = get (sizeof (ui32));
for (unsigned int i = 0; i < sizeof (ui32); ++i) {
ui32 <<= 8; ui32 <<= 8;
ui32 |= (unsigned char) *get (1); ui32 |= (unsigned char) cp [sizeof (ui32) - 1 - i];
} }
} }
@ -156,9 +157,10 @@ ProtocolBufferReader::read (uint64_t &ui64)
} else { } else {
ui64 = 0; ui64 = 0;
for (unsigned int i = 0; i < sizeof (ui64) && ! at_end (); ++i) { const char *cp = get (sizeof (ui64));
for (unsigned int i = 0; i < sizeof (ui64); ++i) {
ui64 <<= 8; ui64 <<= 8;
ui64 |= (unsigned char) *get (1); ui64 |= (unsigned char) cp [sizeof (ui64) - 1 - i];
} }
} }
@ -194,6 +196,10 @@ ProtocolBufferReader::open ()
{ {
size_t value = 0; size_t value = 0;
read (value); read (value);
if (! m_seq_counts.empty ()) {
// take out the following bytes from the current sequence
m_seq_counts.back () -= value;
}
m_seq_counts.push_back (value); m_seq_counts.push_back (value);
} }
@ -325,7 +331,7 @@ void ProtocolBufferWriter::write (int tag, uint32_t v, bool fixed)
char b[sizeof (v)]; char b[sizeof (v)];
for (unsigned int i = 0; i < sizeof (v); ++i) { for (unsigned int i = 0; i < sizeof (v); ++i) {
b[sizeof (v) - 1 - i] = (char) v; b[i] = (char) v;
v >>= 8; v >>= 8;
} }
@ -374,7 +380,7 @@ void ProtocolBufferWriter::write (int tag, uint64_t v, bool fixed)
char b[sizeof (v)]; char b[sizeof (v)];
for (unsigned int i = 0; i < sizeof (v); ++i) { for (unsigned int i = 0; i < sizeof (v); ++i) {
b[sizeof (v) - 1 - i] = (char) v; b[i] = (char) v;
v >>= 8; v >>= 8;
} }
@ -464,6 +470,7 @@ void ProtocolBufferWriter::end_seq ()
// just for adding the required bytes // just for adding the required bytes
if (is_counting ()) { if (is_counting ()) {
m_byte_counter_stack.back () += m_bytes_counted;
write_varint (m_bytes_counted); write_varint (m_bytes_counted);
} }