diff --git a/riscv/insns/sha512sig0h.h b/riscv/insns/sha512sig0h.h
index c28716f8..7cd5f2f1 100644
--- a/riscv/insns/sha512sig0h.h
+++ b/riscv/insns/sha512sig0h.h
@@ -2,8 +2,8 @@
 require_rv32;
 require_extension('K');
 
-uint32_t result =
-    ((uint32_t)RS1 >>  1) ^ ((uint32_t)RS1 >>  7) ^ ((uint32_t)RS1 >>  8) ^
-    ((uint32_t)RS2 << 31) ^                         ((uint32_t)RS2 << 24);
+reg_t result =
+    (zext32(RS1) >>  1) ^ (zext32(RS1) >>  7) ^ (zext32(RS1) >>  8) ^
+    (zext32(RS2) << 31) ^                       (zext32(RS2) << 24);
 
-WRITE_RD(zext_xlen(result));
+WRITE_RD(sext_xlen(result));
diff --git a/riscv/insns/sha512sig0l.h b/riscv/insns/sha512sig0l.h
index d0a6db25..99d7aa9a 100644
--- a/riscv/insns/sha512sig0l.h
+++ b/riscv/insns/sha512sig0l.h
@@ -2,8 +2,8 @@
 require_rv32;
 require_extension('K');
 
-uint32_t result =
-    ((uint32_t)RS1 >>  1) ^ ((uint32_t)RS1 >>  7) ^ ((uint32_t)RS1 >>  8) ^
-    ((uint32_t)RS2 << 31) ^ ((uint32_t)RS2 << 25) ^ ((uint32_t)RS2 << 24);
+reg_t result =
+    (zext32(RS1) >>  1) ^ (zext32(RS1) >>  7) ^ (zext32(RS1) >>  8) ^
+    (zext32(RS2) << 31) ^ (zext32(RS2) << 25) ^ (zext32(RS2) << 24);
 
-WRITE_RD(zext_xlen(result));
+WRITE_RD(sext_xlen(result));
diff --git a/riscv/insns/sha512sig1h.h b/riscv/insns/sha512sig1h.h
index 18ba85fe..ed3fa32d 100644
--- a/riscv/insns/sha512sig1h.h
+++ b/riscv/insns/sha512sig1h.h
@@ -2,8 +2,8 @@
 require_rv32;
 require_extension('K');
 
-uint32_t result =
-    ((uint32_t)RS1 <<  3) ^ ((uint32_t)RS1 >>  6) ^ ((uint32_t)RS1 >> 19) ^
-    ((uint32_t)RS2 >> 29) ^                         ((uint32_t)RS2 << 13);
+reg_t result =
+    (zext32(RS1) <<  3) ^ (zext32(RS1) >>  6) ^ (zext32(RS1) >> 19) ^
+    (zext32(RS2) >> 29) ^                       (zext32(RS2) << 13);
 
-WRITE_RD(zext_xlen(result));
+WRITE_RD(sext_xlen(result));
diff --git a/riscv/insns/sha512sig1l.h b/riscv/insns/sha512sig1l.h
index 691ef32e..84694d1e 100644
--- a/riscv/insns/sha512sig1l.h
+++ b/riscv/insns/sha512sig1l.h
@@ -2,8 +2,8 @@
 require_rv32;
 require_extension('K');
 
-uint32_t result =
-    ((uint32_t)RS1 <<  3) ^ ((uint32_t)RS1 >>  6) ^ ((uint32_t)RS1 >> 19) ^
-    ((uint32_t)RS2 >> 29) ^ ((uint32_t)RS2 << 26) ^ ((uint32_t)RS2 << 13);
+reg_t result =
+    (zext32(RS1) <<  3) ^ (zext32(RS1) >>  6) ^ (zext32(RS1) >> 19) ^
+    (zext32(RS2) >> 29) ^ (zext32(RS2) << 26) ^ (zext32(RS2) << 13);
 
-WRITE_RD(zext_xlen(result));
+WRITE_RD(sext_xlen(result));
diff --git a/riscv/insns/sha512sum0r.h b/riscv/insns/sha512sum0r.h
index e2772e33..87afee96 100644
--- a/riscv/insns/sha512sum0r.h
+++ b/riscv/insns/sha512sum0r.h
@@ -2,8 +2,8 @@
 require_rv32;
 require_extension('K');
 
-uint32_t result =
-    ((uint32_t)RS1 << 25) ^ ((uint32_t)RS1 << 30) ^ ((uint32_t)RS1 >> 28) ^
-    ((uint32_t)RS2 >>  7) ^ ((uint32_t)RS2 >>  2) ^ ((uint32_t)RS2 <<  4);
+reg_t result =
+    (zext32(RS1) << 25) ^ (zext32(RS1) << 30) ^ (zext32(RS1) >> 28) ^
+    (zext32(RS2) >>  7) ^ (zext32(RS2) >>  2) ^ (zext32(RS2) <<  4);
 
-WRITE_RD(zext_xlen(result));
+WRITE_RD(sext_xlen(result));
diff --git a/riscv/insns/sha512sum1r.h b/riscv/insns/sha512sum1r.h
index e5dfaa98..1e526967 100644
--- a/riscv/insns/sha512sum1r.h
+++ b/riscv/insns/sha512sum1r.h
@@ -2,8 +2,8 @@
 require_rv32;
 require_extension('K');
 
-uint32_t result =
-    ((uint32_t)RS1 << 23) ^ ((uint32_t)RS1 >> 14) ^ ((uint32_t)RS1 >> 18) ^
-    ((uint32_t)RS2 >>  9) ^ ((uint32_t)RS2 << 18) ^ ((uint32_t)RS2 << 14);
+reg_t result =
+    (zext32(RS1) << 23) ^ (zext32(RS1) >> 14) ^ (zext32(RS1) >> 18) ^
+    (zext32(RS2) >>  9) ^ (zext32(RS2) << 18) ^ (zext32(RS2) << 14);
 
-WRITE_RD(zext_xlen(result));
+WRITE_RD(sext_xlen(result));