Fixed range issues on sr<al>[i]32.u insns (see #695) (#740)

5 years ago · 21f4b59d3a
4 changed files with 4 additions and 4 deletions
--- a/riscv/insns/sra32_u.h
+++ b/riscv/insns/sra32_u.h
@ -1,7 +1,7 @@
 require_rv64;
 P_X_LOOP(32, 5, {
  if(sa > 0)
-    pd = ((ps1 >> (sa - 1)) + 1) >> 1;
+    pd = (((uint64_t)(ps1 >> (sa - 1))) + 1) >> 1;
  else
    pd = ps1;
 })
--- a/riscv/insns/srai32_u.h
+++ b/riscv/insns/srai32_u.h
@ -1,7 +1,7 @@
 require_rv64;
 P_I_LOOP(32, 5, {
  if (imm5u > 0)
-    pd = ((ps1 >> (imm5u - 1)) + 1) >> 1;
+    pd = (((uint64_t)(ps1 >> (imm5u - 1))) + 1) >> 1;
  else
    pd = ps1;
 })
--- a/riscv/insns/srl32_u.h
+++ b/riscv/insns/srl32_u.h
@ -1,7 +1,7 @@
 require_rv64;
 P_X_ULOOP(32, 5, {
  if (sa > 0) {
-    pd = ((ps1 >> (sa - 1)) + 1) >> 1;
+    pd = (((uint64_t)(ps1 >> (sa - 1))) + 1) >> 1;
  } else {
    pd = ps1;
  }
--- a/riscv/insns/srli32_u.h
+++ b/riscv/insns/srli32_u.h
@ -1,7 +1,7 @@
 require_rv64;
 P_I_ULOOP(32, 5, {
  if (imm5u > 0) {
-    pd = ((ps1 >> (imm5u - 1)) + 1) >> 1;
+    pd = (((uint64_t)(ps1 >> (imm5u - 1))) + 1) >> 1;
  } else {
    pd = ps1;
  }