diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/controller.h | 2 | ||||
| -rw-r--r-- | inc/ex.h | 2 | ||||
| -rw-r--r-- | inc/id.h | 2 | ||||
| -rw-r--r-- | inc/if.h | 2 | ||||
| -rw-r--r-- | inc/mm.h | 2 | ||||
| -rw-r--r-- | inc/stage.h | 4 | ||||
| -rw-r--r-- | inc/wb.h | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/inc/controller.h b/inc/controller.h index ac83a78..1c7b2d6 100644 --- a/inc/controller.h +++ b/inc/controller.h @@ -36,7 +36,7 @@ class Controller : public Stage * @return the pc. */ int get_pc(); - Response advance(InstrDTO &i, Response p) override; + InstrDTO *advance(Response p) override; }; #endif /* CONTROLLER_H_INCLUDED */ @@ -14,7 +14,7 @@ class EX : public Stage */ EX(Stage *next); - Response advance(InstrDTO &next_instr, Response p) override; + InstrDTO *advance(Response p) override; }; #endif /* EX_H_INCLUDED */ @@ -15,7 +15,7 @@ class ID : public Stage */ ID(Stage *next); - Response advance(InstrDTO &next_instr, Response p) override; + InstrDTO *advance(Response p) override; /* The following methods are made public so that they may be tested, and are * not to be called from outside classes during standard execution. @@ -15,7 +15,7 @@ class IF : public Stage */ IF(Stage *next); - Response advance(InstrDTO &next_instr, Response p) override; + InstrDTO *advance(Response p) override; private: /** @@ -14,7 +14,7 @@ class MM : public Stage */ MM(Stage *next); - Response advance(InstrDTO &next_instr, Response p) override; + InstrDTO *advance(Response p) override; }; #endif /* MM_H_INCLUDED */ diff --git a/inc/stage.h b/inc/stage.h index 19e3896..50c413a 100644 --- a/inc/stage.h +++ b/inc/stage.h @@ -27,7 +27,7 @@ class Stage * @return a response, indicating whether this pipeline stage is stalling, * busy, or done. */ - virtual Response advance(InstrDTO &next_instr, Response p) = 0; + virtual InstrDTO *advance(Response p) = 0; protected: /** @@ -83,7 +83,7 @@ class Stage /** * A pointer to the current instruction this stage is processing. */ - std::unique_ptr<InstrDTO> curr_instr; + InstrDTO *curr_instr; /** * The current status of this stage. */ @@ -1,8 +1,8 @@ #ifndef WB_H #define WB_H +#include "instrDTO.h" #include "response.h" #include "stage.h" -#include "instrDTO.h" class WB : public Stage { @@ -14,7 +14,7 @@ class WB : public Stage */ WB(Stage *next); - Response advance(InstrDTO &next_instr, Response p) override; + InstrDTO *advance(Response p) override; }; #endif /* WB_H_INCLUDED */ |