wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed simulator leak

Browse Source
This commit is contained in:
Blaise Tine
2020-07-21 06:17:41 -07:00
parent ff7f65bd1f
commit fb44de8017
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hw/simulate/simulator.cpp
View File

@@ -11,7 +11,7 @@ double sc_time_stamp() {
Simulator::Simulator() { Simulator::Simulator() {
// force random values for unitialized signals // force random values for unitialized signals
Verilated::randReset(2); Verilated::randReset(1);
// Turn off assertion before reset // Turn off assertion before reset
Verilated::assertOn(false); Verilated::assertOn(false);
@@ -105,9 +105,8 @@ void Simulator::eval_dram_bus() {
if (!dram_rsp_active_) { if (!dram_rsp_active_) {
if (dequeue_index != -1) { if (dequeue_index != -1) {
vortex_->dram_rsp_valid = 1; vortex_->dram_rsp_valid = 1;
memcpy((uint8_t*)vortex_->dram_rsp_data, dram_rsp_vec_[dequeue_index].data, GLOBAL_BLOCK_SIZE); memcpy((uint8_t*)vortex_->dram_rsp_data, dram_rsp_vec_[dequeue_index].block.data(), GLOBAL_BLOCK_SIZE);
vortex_->dram_rsp_tag = dram_rsp_vec_[dequeue_index].tag; vortex_->dram_rsp_tag = dram_rsp_vec_[dequeue_index].tag;
free(dram_rsp_vec_[dequeue_index].data);
dram_rsp_vec_.erase(dram_rsp_vec_.begin() + dequeue_index); dram_rsp_vec_.erase(dram_rsp_vec_.begin() + dequeue_index);
dram_rsp_active_ = true; dram_rsp_active_ = true;
} else { } else {
@@ -141,9 +140,8 @@ void Simulator::eval_dram_bus() {
} else { } else {
dram_req_t dram_req; dram_req_t dram_req;
dram_req.cycles_left = DRAM_LATENCY; dram_req.cycles_left = DRAM_LATENCY;
dram_req.data = (uint8_t*)malloc(GLOBAL_BLOCK_SIZE);
dram_req.tag = vortex_->dram_req_tag; dram_req.tag = vortex_->dram_req_tag;
ram_->read(vortex_->dram_req_addr * GLOBAL_BLOCK_SIZE, GLOBAL_BLOCK_SIZE, dram_req.data); ram_->read(vortex_->dram_req_addr * GLOBAL_BLOCK_SIZE, GLOBAL_BLOCK_SIZE, dram_req.block.data());
dram_rsp_vec_.push_back(dram_req); dram_rsp_vec_.push_back(dram_req);
} }
} }

2
hw/simulate/simulator.h
View File

@@ -21,7 +21,7 @@
typedef struct { typedef struct {
int cycles_left; int cycles_left;
uint8_t *data; std::array<uint8_t, GLOBAL_BLOCK_SIZE> block;
unsigned tag; unsigned tag;
} dram_req_t; } dram_req_t;