minor warning fixes

This commit is contained in:
Blaise Tine 2022-01-10 20:33:37 -05:00
parent d7737542e4
commit 29df0da8b5
4 changed files with 11 additions and 4 deletions

View file

@ -2,6 +2,7 @@
#include <vector>
#include <unordered_map>
#include <cstdint>
namespace vortex {
struct BadAddress {};

View file

@ -377,7 +377,7 @@ WarpMask Core::wspawn(int num_warps, int nextPC) {
warp->setTmask(0, true);
ret.set(i);
}
return std::move(ret);
return ret;
}
WarpMask Core::barrier(int bar_id, int count, int warp_id) {
@ -387,7 +387,7 @@ WarpMask Core::barrier(int bar_id, int count, int warp_id) {
if (barrier.count() < (size_t)count) {
warps_.at(warp_id)->suspend();
DP(3, "*** Suspend warp #" << warp_id << " at barrier #" << bar_id);
return std::move(ret);
return ret;
}
for (int i = 0; i < arch_.num_warps(); ++i) {
if (barrier.test(i)) {
@ -397,7 +397,7 @@ WarpMask Core::barrier(int bar_id, int count, int warp_id) {
}
}
barrier.reset();
return std::move(ret);
return ret;
}
Word Core::icache_read(Addr addr, Size size) {

View file

@ -67,6 +67,8 @@ static const char* op_string(const Instr &instr) {
case 5: return "DIVU";
case 6: return "REM";
case 7: return "REMU";
default:
std::abort();
}
} else {
switch (func3) {
@ -78,6 +80,8 @@ static const char* op_string(const Instr &instr) {
case 5: return func7 ? "SRA" : "SRL";
case 6: return "OR";
case 7: return "AND";
default:
std::abort();
}
}
case Opcode::I_INST:
@ -90,6 +94,8 @@ static const char* op_string(const Instr &instr) {
case 5: return func7 ? "SRAI" : "SRLI";
case 6: return "ORI";
case 7: return "ANDI";
default:
std::abort();
}
case Opcode::B_INST:
switch (func3) {

View file

@ -80,7 +80,7 @@ public:
++r;
}
}
return std::move(out);
return out;
}
void reserve(pipeline_trace_t* state) {