From 29df0da8b5505a5853c07664e3ba07a9214e4726 Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@hotmail.com>
Date: Mon, 10 Jan 2022 20:33:37 -0500
Subject: [PATCH] minor warning fixes

---
 sim/common/mem.h      | 1 +
 sim/simx/core.cpp     | 6 +++---
 sim/simx/decode.cpp   | 6 ++++++
 sim/simx/scoreboard.h | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sim/common/mem.h b/sim/common/mem.h
index d404602d..cfbce480 100644
--- a/sim/common/mem.h
+++ b/sim/common/mem.h
@@ -2,6 +2,7 @@
 
 #include <vector>
 #include <unordered_map>
+#include <cstdint>
 
 namespace vortex {
 struct BadAddress {};
diff --git a/sim/simx/core.cpp b/sim/simx/core.cpp
index fd11befd..5b9e7a4d 100644
--- a/sim/simx/core.cpp
+++ b/sim/simx/core.cpp
@@ -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) {
diff --git a/sim/simx/decode.cpp b/sim/simx/decode.cpp
index 86e30266..78b408e4 100644
--- a/sim/simx/decode.cpp
+++ b/sim/simx/decode.cpp
@@ -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) {
diff --git a/sim/simx/scoreboard.h b/sim/simx/scoreboard.h
index c468860d..8a12efb7 100644
--- a/sim/simx/scoreboard.h
+++ b/sim/simx/scoreboard.h
@@ -80,7 +80,7 @@ public:
                 ++r;
             }
         }
-        return std::move(out);
+        return out;
     }
     
     void reserve(pipeline_trace_t* state) {