diff options
Diffstat (limited to 'src/sim')
| -rw-r--r-- | src/sim/ex.cc | 45 | ||||
| -rw-r--r-- | src/sim/stage.cc | 12 |
2 files changed, 44 insertions, 13 deletions
diff --git a/src/sim/ex.cc b/src/sim/ex.cc index b4e86ac..b043eb3 100644 --- a/src/sim/ex.cc +++ b/src/sim/ex.cc @@ -227,23 +227,50 @@ EX::EX(Stage *stage) : Stage(stage) }), /* J type instructions */ - INIT_INSTRUCTION(JMP, {}), + INIT_INSTRUCTION( + JMP, + { + s1 = s1 + s2; + (void)this; + }), - INIT_INSTRUCTION(JRL, {}), + INIT_INSTRUCTION( + JRL, + { + s1 = this->pc + s2; + (void)this; + }), - INIT_INSTRUCTION(JAL, {}), + INIT_INSTRUCTION( + JAL, + { + s1 = s1 + s2; + (void)this; + }), - INIT_INSTRUCTION(BEQ, {}), + INIT_INSTRUCTION(BEQ, { s1 = this->pc + s2; }), - INIT_INSTRUCTION(BGT, {}), + INIT_INSTRUCTION(BGT, { s1 = this->pc + s2; }), - INIT_INSTRUCTION(BUF, {}), + INIT_INSTRUCTION(BUF, { s1 = this->pc + s2; }), - INIT_INSTRUCTION(BOF, {}), + INIT_INSTRUCTION(BOF, { s1 = this->pc + s2; }), - INIT_INSTRUCTION(PUSH, {}), + INIT_INSTRUCTION( + PUSH, + { + (void)s2; + (void)s1; + (void)this; + }), - INIT_INSTRUCTION(POP, {}), + INIT_INSTRUCTION( + POP, + { + (void)s2; + (void)s1; + (void)this; + }), /* NOP */ INIT_INSTRUCTION( diff --git a/src/sim/stage.cc b/src/sim/stage.cc index 74a2176..2c03741 100644 --- a/src/sim/stage.cc +++ b/src/sim/stage.cc @@ -21,6 +21,14 @@ Storage *Stage::storage; bool Stage::is_pipelined; int Stage::clock_cycle; +bool Stage::get_condition(CC c) { + return (this->gprs[3] >> c) & 1; +} + +void Stage::set_pc(unsigned int pc) { + this->pc = pc; +} + InstrDTO *Stage::advance(Response p) { InstrDTO *r = nullptr; @@ -50,10 +58,6 @@ void Stage::set_condition(CC c, bool v) this->gprs[3] = this->gprs[3] & ~(1 << c); } -bool Stage::get_condition(CC c) { - return (this->gprs[3] >> c) & 1; -} - signed int Stage::dereference_register(signed int v) { signed int r; |