diff --git a/riscv/insns/amoadd_b.h b/riscv/insns/amoadd_b.h
index cd13ed5bd1..ce6748863d 100644
--- a/riscv/insns/amoadd_b.h
+++ b/riscv/insns/amoadd_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](uint8_t lhs) { return lhs + RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](int8_t lhs) { return lhs + RS2; })));
diff --git a/riscv/insns/amoadd_h.h b/riscv/insns/amoadd_h.h
index 8230838ff2..93d2209fb6 100644
--- a/riscv/insns/amoadd_h.h
+++ b/riscv/insns/amoadd_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](uint16_t lhs) { return lhs + RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](int16_t lhs) { return lhs + RS2; })));
diff --git a/riscv/insns/amoand_b.h b/riscv/insns/amoand_b.h
index 5779382daa..f103888695 100644
--- a/riscv/insns/amoand_b.h
+++ b/riscv/insns/amoand_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](uint8_t lhs) { return lhs & RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](int8_t lhs) { return lhs & RS2; })));
diff --git a/riscv/insns/amoand_h.h b/riscv/insns/amoand_h.h
index 15120bcc63..7034118e60 100644
--- a/riscv/insns/amoand_h.h
+++ b/riscv/insns/amoand_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](uint16_t lhs) { return lhs & RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](int16_t lhs) { return lhs & RS2; })));
diff --git a/riscv/insns/amocas_b.h b/riscv/insns/amocas_b.h
index d2198deb0e..54ba824359 100644
--- a/riscv/insns/amocas_b.h
+++ b/riscv/insns/amocas_b.h
@@ -1,3 +1,3 @@
 require_extension(EXT_ZACAS);
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo_compare_and_swap<uint8_t>(RS1, RD, RS2)));
+WRITE_RD(sreg_t(MMU.amo_compare_and_swap<int8_t>(RS1, RD, RS2)));
diff --git a/riscv/insns/amocas_h.h b/riscv/insns/amocas_h.h
index e9694ac834..064d041960 100644
--- a/riscv/insns/amocas_h.h
+++ b/riscv/insns/amocas_h.h
@@ -1,3 +1,3 @@
 require_extension(EXT_ZACAS);
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo_compare_and_swap<uint16_t>(RS1, RD, RS2)));
+WRITE_RD(sreg_t(MMU.amo_compare_and_swap<int16_t>(RS1, RD, RS2)));
diff --git a/riscv/insns/amomax_b.h b/riscv/insns/amomax_b.h
index 8cf0d2155f..84df51af25 100644
--- a/riscv/insns/amomax_b.h
+++ b/riscv/insns/amomax_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](int8_t lhs) { return std::max(lhs, int8_t(RS2)); })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](int8_t lhs) { return std::max(lhs, int8_t(RS2)); })));
diff --git a/riscv/insns/amomax_h.h b/riscv/insns/amomax_h.h
index 2418dbf61e..d91fe1986f 100644
--- a/riscv/insns/amomax_h.h
+++ b/riscv/insns/amomax_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](int16_t lhs) { return std::max(lhs, int16_t(RS2)); })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](int16_t lhs) { return std::max(lhs, int16_t(RS2)); })));
diff --git a/riscv/insns/amomaxu_b.h b/riscv/insns/amomaxu_b.h
index baf210f82a..d56b98ea90 100644
--- a/riscv/insns/amomaxu_b.h
+++ b/riscv/insns/amomaxu_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](uint8_t lhs) { return std::max(lhs, uint8_t(RS2)); })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](uint8_t lhs) { return std::max(lhs, uint8_t(RS2)); })));
diff --git a/riscv/insns/amomaxu_h.h b/riscv/insns/amomaxu_h.h
index 8878e2b8fd..76cfa779fd 100644
--- a/riscv/insns/amomaxu_h.h
+++ b/riscv/insns/amomaxu_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](uint16_t lhs) { return std::max(lhs, uint16_t(RS2)); })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](uint16_t lhs) { return std::max(lhs, uint16_t(RS2)); })));
diff --git a/riscv/insns/amomin_b.h b/riscv/insns/amomin_b.h
index b9cec0dd02..9b781e49f1 100644
--- a/riscv/insns/amomin_b.h
+++ b/riscv/insns/amomin_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](int8_t lhs) { return std::min(lhs, int8_t(RS2)); })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](int8_t lhs) { return std::min(lhs, int8_t(RS2)); })));
diff --git a/riscv/insns/amomin_h.h b/riscv/insns/amomin_h.h
index 3c3cf56a39..4405ac3e8c 100644
--- a/riscv/insns/amomin_h.h
+++ b/riscv/insns/amomin_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](int16_t lhs) { return std::min(lhs, int16_t(RS2)); })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](int16_t lhs) { return std::min(lhs, int16_t(RS2)); })));
diff --git a/riscv/insns/amominu_b.h b/riscv/insns/amominu_b.h
index daee0a66d3..7e12bf3c58 100644
--- a/riscv/insns/amominu_b.h
+++ b/riscv/insns/amominu_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](uint8_t lhs) { return std::min(lhs, uint8_t(RS2)); })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](uint8_t lhs) { return std::min(lhs, uint8_t(RS2)); })));
diff --git a/riscv/insns/amominu_h.h b/riscv/insns/amominu_h.h
index 4f7a45782b..60226fb4e8 100644
--- a/riscv/insns/amominu_h.h
+++ b/riscv/insns/amominu_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](uint16_t lhs) { return std::min(lhs, uint16_t(RS2)); })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](uint16_t lhs) { return std::min(lhs, uint16_t(RS2)); })));
diff --git a/riscv/insns/amoor_b.h b/riscv/insns/amoor_b.h
index 0019b1c29a..3048ee9023 100644
--- a/riscv/insns/amoor_b.h
+++ b/riscv/insns/amoor_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](uint8_t lhs) { return lhs | RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](int8_t lhs) { return lhs | RS2; })));
diff --git a/riscv/insns/amoor_h.h b/riscv/insns/amoor_h.h
index e0070da5a0..1e71a51091 100644
--- a/riscv/insns/amoor_h.h
+++ b/riscv/insns/amoor_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](uint16_t lhs) { return lhs | RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](int16_t lhs) { return lhs | RS2; })));
diff --git a/riscv/insns/amoswap_b.h b/riscv/insns/amoswap_b.h
index d68e4200cd..54c9e6ebf2 100644
--- a/riscv/insns/amoswap_b.h
+++ b/riscv/insns/amoswap_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](uint8_t UNUSED lhs) { return RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](int8_t UNUSED lhs) { return RS2; })));
diff --git a/riscv/insns/amoswap_h.h b/riscv/insns/amoswap_h.h
index d8f34a253e..0c1a8ff20c 100644
--- a/riscv/insns/amoswap_h.h
+++ b/riscv/insns/amoswap_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](uint16_t UNUSED lhs) { return RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](int16_t UNUSED lhs) { return RS2; })));
diff --git a/riscv/insns/amoxor_b.h b/riscv/insns/amoxor_b.h
index ef8da38ff7..dbaf591771 100644
--- a/riscv/insns/amoxor_b.h
+++ b/riscv/insns/amoxor_b.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int8_t)MMU.amo<uint8_t>(RS1, [&](uint8_t lhs) { return lhs ^ RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int8_t>(RS1, [&](int8_t lhs) { return lhs ^ RS2; })));
diff --git a/riscv/insns/amoxor_h.h b/riscv/insns/amoxor_h.h
index 15b414f0e0..110acf7e73 100644
--- a/riscv/insns/amoxor_h.h
+++ b/riscv/insns/amoxor_h.h
@@ -1,2 +1,2 @@
 require_extension(EXT_ZABHA);
-WRITE_RD(sreg_t((int16_t)MMU.amo<uint16_t>(RS1, [&](uint16_t lhs) { return lhs ^ RS2; })));
+WRITE_RD(sreg_t(MMU.amo<int16_t>(RS1, [&](int16_t lhs) { return lhs ^ RS2; })));