luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArrayTable prevent block overflow

This commit is contained in:
James Cherry 2020-09-07 09:04:17 -07:00
parent b57fcf173e
commit ab2b1924e8
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sta/ArrayTable.hh
View File

@ -13,6 +13,7 @@
#include "Vector.hh" #include "Vector.hh"
#include "ObjectId.hh" #include "ObjectId.hh"
#include "Error.hh"
namespace sta { namespace sta {
@ -42,8 +43,9 @@ public:
size_t size() const { return size_; } size_t size() const { return size_; }
void clear(); void clear();
static constexpr ObjectId idx_bits = 10; static constexpr int idx_bits = 7;
static constexpr ObjectId block_size = (1 << idx_bits); static constexpr int block_size = (1 << idx_bits);
static constexpr int block_id_max = 1 << (object_id_bits - idx_bits);
private: private:
ArrayBlock<TYPE> *makeBlock(uint32_t size); ArrayBlock<TYPE> *makeBlock(uint32_t size);
@ -129,6 +131,8 @@ void
ArrayTable<TYPE>::pushBlock(ArrayBlock<TYPE> *block) ArrayTable<TYPE>::pushBlock(ArrayBlock<TYPE> *block)
{ {
blocks_[blocks_size_++] = block; blocks_[blocks_size_++] = block;
if (blocks_size_ >= block_id_max)
internalError("max array table block count exceeded.");
if (blocks_size_ == blocks_capacity_) { if (blocks_size_ == blocks_capacity_) {
size_t new_capacity = blocks_capacity_ * 1.5; size_t new_capacity = blocks_capacity_ * 1.5;
ArrayBlock<TYPE>** new_blocks = new ArrayBlock<TYPE>*[new_capacity]; ArrayBlock<TYPE>** new_blocks = new ArrayBlock<TYPE>*[new_capacity];

1
include/sta/ObjectId.hh
View File

@ -19,6 +19,7 @@ typedef uint32_t BlockIdx;
// Object index within a block. // Object index within a block.
typedef uint32_t ObjectIdx; typedef uint32_t ObjectIdx;
static constexpr int object_id_bits = sizeof(ObjectId) * 8;
static constexpr BlockIdx block_idx_null = 0; static constexpr BlockIdx block_idx_null = 0;
static constexpr ObjectId object_id_null = 0; static constexpr ObjectId object_id_null = 0;
static constexpr ObjectIdx object_idx_null = 0; static constexpr ObjectIdx object_idx_null = 0;

7
include/sta/ObjectTable.hh
View File

@ -43,8 +43,9 @@ public:
void clear(); void clear();
// Objects are allocated in blocks of 128. // Objects are allocated in blocks of 128.
static constexpr ObjectId idx_bits = 7; static constexpr int idx_bits = 7;
static constexpr ObjectId block_object_count = (1 << idx_bits); static constexpr int block_object_count = (1 << idx_bits);
static constexpr int block_id_max = 1 << (object_id_bits - idx_bits);
private: private:
void makeBlock(); void makeBlock();
@ -104,6 +105,8 @@ ObjectTable<TYPE>::makeBlock()
BlockIdx block_index = blocks_.size(); BlockIdx block_index = blocks_.size();
TableBlock<TYPE> *block = new TableBlock<TYPE>(block_index, this); TableBlock<TYPE> *block = new TableBlock<TYPE>(block_index, this);
blocks_.push_back(block); blocks_.push_back(block);
if (blocks_.size() >= block_id_max)
internalError("max object table block count exceeded.");
// ObjectId zero is reserved for object_id_null. // ObjectId zero is reserved for object_id_null.
int last = (block_index > 0) ? 0 : 1; int last = (block_index > 0) ? 0 : 1;
for (int i = block_object_count - 1; i >= last; i--) { for (int i = block_object_count - 1; i >= last; i--) {