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

Merge pull request #242 from The6P4C/master 

icepack: Fix Windows-only stack overflow in CRAM pbm generation (fixe…
This commit is contained in:
Claire Wolf 2020-04-22 18:01:58 +02:00 committed by GitHub
parent cf3f4b53c3 578037dedf
commit 3fb2d2f735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
icepack/icepack.cc
View File

@ -968,7 +968,25 @@ void FpgaConfig::write_cram_pbm(std::ostream &ofs, int bank_num) const
ofs << "P3\n";
ofs << stringf("%d %d\n", 2*this->cram_width, 2*this->cram_height);
ofs << "255\n";
uint32_t tile_type[4][this->cram_width][this->cram_height];
vector<vector<uint32_t>> tile_type[4];
// We require random access to tile_type, so ensure that each column of each
// bank is initialised so that all possible indices are valid
for (int bank = 0; bank < 4; bank++) {
tile_type[bank].reserve(this->cram_width);
for (int x = 0; x < this->cram_width; x++) {
tile_type[bank].push_back(vector<uint32_t>(this->cram_height));
for (int y = 0; y < this->cram_height; y++) {
// Initialisation value unimportant - will be overwritten during
// image generation
tile_type[bank][x].push_back(0);
}
}
}
for (int y = 0; y <= this->chip_height()+1; y++)
for (int x = 0; x <= this->chip_width()+1; x++)
{