diff options
| author | Siddarth Suresh <155843085+SiddarthSuresh98@users.noreply.github.com> | 2025-04-17 10:50:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-17 10:50:58 -0400 |
| commit | 62b9e280d5d0222710e491dcd28fe26bea915dcd (patch) | |
| tree | e1f68ac7a6e4dc481c19346e38ad20d113f13825 /src/sim/ex.cc | |
| parent | b778ccc3e7c2f2ac3c4892a87f5269f342fd895f (diff) | |
| parent | 430986b4b1ee1013db070991ce289176f48fa8e8 (diff) | |
Merge pull request #52 from bdunahu/bdunahu
[WIP] Partial fixes for changes in DRAM/Cache, including uncovered bug
Diffstat (limited to 'src/sim/ex.cc')
| -rw-r--r-- | src/sim/ex.cc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/sim/ex.cc b/src/sim/ex.cc index 50f00a8..d20d15f 100644 --- a/src/sim/ex.cc +++ b/src/sim/ex.cc @@ -1,10 +1,9 @@ #include "ex.h" #include "accessor.h" -#include "pipe_spec.h" #include "instrDTO.h" +#include "pipe_spec.h" #include "response.h" #include "stage.h" -#include "utils.h" #include <unordered_map> // clang-format off @@ -313,32 +312,28 @@ EX::EX(Stage *stage) : Stage(stage) INIT_INSTRUCTION( BEQ, { - (this->get_condition(EQ)) ? s1 = wrap_address(pc + s2) - : s1 = -1; + (this->get_condition(EQ)) ? s1 = pc + s2 : s1 = -1; (void)s3; }), INIT_INSTRUCTION( BGT, { - (this->get_condition(GT)) ? s1 = wrap_address(pc + s2) - : s1 = -1; + (this->get_condition(GT)) ? s1 = pc + s2 : s1 = -1; (void)s3; }), INIT_INSTRUCTION( BUF, { - (this->get_condition(UF)) ? s1 = wrap_address(pc + s2) - : s1 = -1; + (this->get_condition(UF)) ? s1 = pc + s2 : s1 = -1; (void)s3; }), INIT_INSTRUCTION( BOF, { - (this->get_condition(OF)) ? s1 = wrap_address(pc + s2) - : s1 = -1; + (this->get_condition(OF)) ? s1 = pc + s2 : s1 = -1; (void)s3; }), @@ -387,7 +382,7 @@ void EX::advance_helper() s3 = this->curr_instr->get_s3(); pc = this->curr_instr->get_pc(); - this->instr_map[m](s1, s2, s3, pc ); + this->instr_map[m](s1, s2, s3, pc); this->curr_instr->set_s1(s1); this->status = OK; |