[sim] fixed some compiler warnings

diff --git a/riscv/insns/div.h b/riscv/insns/div.h
index f6a9b6bbeec6a551b79c103fc5ba24d5e0e50632..1f61cf161384a774a27d8ad2b692cded8528d571 100644 (file)
--- a/riscv/insns/div.h
+++ b/riscv/insns/div.h
@@ -1,5 +1,5 @@
 require64;
-if(RS2 == 0 || sreg_t(RS1) == INT64_MIN && sreg_t(RS2) == -1)
+if(RS2 == 0 || (sreg_t(RS1) == INT64_MIN && sreg_t(RS2) == -1))
   RD = sreg_t(RS1) < 0 ? INT64_MIN : INT64_MAX;
 else
   RD = sreg_t(RS1) / sreg_t(RS2);

diff --git a/riscv/insns/divw.h b/riscv/insns/divw.h
index 05374695b7c3016c783f836cbe60673bd70d7c89..bfc982a7a50329ad7eab76a3395cc8a34f94eb0f 100644 (file)
--- a/riscv/insns/divw.h
+++ b/riscv/insns/divw.h
@@ -1,4 +1,4 @@
-if(int32_t(RS2) == 0 || int32_t(RS1) == INT32_MIN && int32_t(RS2) == -1)
+if(int32_t(RS2) == 0 || (int32_t(RS1) == INT32_MIN && int32_t(RS2) == -1))
   RD = sext32(int32_t(RS1) < 0 ? INT32_MIN : INT32_MAX);
 else
   RD = sext32(int32_t(RS1)/int32_t(RS2));

diff --git a/riscv/insns/rem.h b/riscv/insns/rem.h
index 146dbc6a3f85ba170b79c3a285b2f1b416221a58..1bc94f2556c165ebe7d687e031433808012ab6d5 100644 (file)
--- a/riscv/insns/rem.h
+++ b/riscv/insns/rem.h
@@ -1,5 +1,5 @@
 require64;
-if(RS2 == 0 || sreg_t(RS1) == INT64_MIN && sreg_t(RS2) == -1)
+if(RS2 == 0 || (sreg_t(RS1) == INT64_MIN && sreg_t(RS2) == -1))
   RD = 0;
 else
   RD = sreg_t(RS1) % sreg_t(RS2);

diff --git a/riscv/insns/remw.h b/riscv/insns/remw.h
index 0e68dc6e3b524e1830b4ec800ea8b13505135871..eb23ef1c4ac90a932f2a1d7aa1153b264fcae1f0 100644 (file)
--- a/riscv/insns/remw.h
+++ b/riscv/insns/remw.h
@@ -1,4 +1,4 @@
-if(int32_t(RS2) == 0 || int32_t(RS1) == INT32_MIN && int32_t(RS2) == -1)
+if(int32_t(RS2) == 0 || (int32_t(RS1) == INT32_MIN && int32_t(RS2) == -1))
   RD = 0;
 else
   RD = sext32(int32_t(RS1) % int32_t(RS2));

diff --git a/riscv/sim.cc b/riscv/sim.cc
index 8b04aa2c005f1a941069ffc92c28c345863e92a6..ffcb186bffae23f2903e0f9e21203a529528f2fd 100644 (file)
--- a/riscv/sim.cc
+++ b/riscv/sim.cc
@@ -4,6 +4,7 @@
 #include <sys/mman.h>
 #include <map>
 #include <iostream>
+#include <climits>
 
 sim_t::sim_t(int _nprocs, size_t _memsz, appserver_link_t* _applink)
   : applink(_applink),