updated instruction casting

riscv-software-src · Nov 2, 2023 · e2d382b · e2d382b
1 parent d244d2c
commit e2d382b
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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; })));