diff options
| author | Roland Green <[email protected]> | 2019-08-26 16:28:51 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-26 16:28:51 -0400 |
| commit | 93e98042f7c4a589bf0e4c7cfcc639c316c8a4b2 (patch) | |
| tree | 1e32c07e932b3d3cc6b977e29a1327274f4f29a8 /src/gpgpu-sim/scoreboard.cc | |
| parent | 6be23a1b36a3311c7dafc45a5e692e38cb351337 (diff) | |
| parent | b88c9e9a545960b7fcc1c373b60005612296158b (diff) | |
Merge pull request #28 from CoffeeBeforeArch/fix_warnings
Fix a bunch of outstanding warnings and undefined behavior. Fix single merge-error with Mahmoud's changes.
Diffstat (limited to 'src/gpgpu-sim/scoreboard.cc')
| -rw-r--r-- | src/gpgpu-sim/scoreboard.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpgpu-sim/scoreboard.cc b/src/gpgpu-sim/scoreboard.cc index 80f95c6..1017e75 100644 --- a/src/gpgpu-sim/scoreboard.cc +++ b/src/gpgpu-sim/scoreboard.cc @@ -140,10 +140,10 @@ bool Scoreboard::checkCollision( unsigned wid, const class inst_t *inst ) const // Get list of all input and output registers std::set<int> inst_regs; - for(int iii=0;iii<inst->outcount;iii++) + for(unsigned iii=0; iii < inst->outcount; iii++) inst_regs.insert(inst->out[iii]); - for(int jjj=0;jjj<inst->incount;jjj++) + for(unsigned jjj=0;jjj<inst->incount;jjj++) inst_regs.insert(inst->in[jjj]); if(inst->pred > 0) inst_regs.insert(inst->pred); |