diff options
Diffstat (limited to 'src/arch/hsail/insts')
-rw-r--r-- | src/arch/hsail/insts/branch.hh | 4 | ||||
-rw-r--r-- | src/arch/hsail/insts/gpu_static_inst.hh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/arch/hsail/insts/branch.hh b/src/arch/hsail/insts/branch.hh index 3a520b216..6df6f766a 100644 --- a/src/arch/hsail/insts/branch.hh +++ b/src/arch/hsail/insts/branch.hh @@ -257,7 +257,7 @@ namespace HsailISA { Wavefront *w = gpuDynInst->wavefront(); - const uint32_t curr_pc = w->pc(); + const uint32_t curr_pc M5_VAR_USED = w->pc(); const uint32_t curr_rpc = w->rpc(); const VectorMask curr_mask = w->execMask(); @@ -281,7 +281,7 @@ namespace HsailISA } // not taken branch - const uint32_t false_pc = curr_pc + 1; + const uint32_t false_pc = nextInstAddr(); assert(true_pc != false_pc); if (false_pc != rpc && true_mask.count() < curr_mask.count()) { VectorMask false_mask = curr_mask & ~true_mask; diff --git a/src/arch/hsail/insts/gpu_static_inst.hh b/src/arch/hsail/insts/gpu_static_inst.hh index 5dcfe78d5..bb40411ed 100644 --- a/src/arch/hsail/insts/gpu_static_inst.hh +++ b/src/arch/hsail/insts/gpu_static_inst.hh @@ -42,6 +42,7 @@ * Defines the base class representing HSAIL GPU static instructions. */ +#include "arch/hsail/gpu_types.hh" #include "gpu-compute/gpu_static_inst.hh" class BrigObject; @@ -54,7 +55,7 @@ namespace HsailISA public: HsailGPUStaticInst(const BrigObject *obj, const std::string &opcode); void generateDisassembly(); - uint32_t instSize() { return 4; } + int instSize() const override { return sizeof(RawMachInst); } bool isValid() const override { return true; } protected: |