Use xlen, not xprlen, to refer to x-register width

17 files changed, 26 insertions, 26 deletions

diff --git a/riscv/insns/add.h b/riscv/insns/add.h
index d7a5c98..895e2b1 100644
--- a/riscv/insns/add.h
+++ b/riscv/insns/add.h
@@ -1 +1 @@
-WRITE_RD(sext_xprlen(RS1 + RS2));
+WRITE_RD(sext_xlen(RS1 + RS2));
diff --git a/riscv/insns/addi.h b/riscv/insns/addi.h
index c861a97..1bb5dce 100644
--- a/riscv/insns/addi.h
+++ b/riscv/insns/addi.h
@@ -1 +1 @@
-WRITE_RD(sext_xprlen(RS1 + insn.i_imm()));
+WRITE_RD(sext_xlen(RS1 + insn.i_imm()));
diff --git a/riscv/insns/auipc.h b/riscv/insns/auipc.h
index d724d10..1a2b169 100644
--- a/riscv/insns/auipc.h
+++ b/riscv/insns/auipc.h
@@ -1 +1 @@
-WRITE_RD(sext_xprlen(insn.u_imm() + pc));
+WRITE_RD(sext_xlen(insn.u_imm() + pc));
diff --git a/riscv/insns/csrrc.h b/riscv/insns/csrrc.h
index 8719267..4667fc8 100644
--- a/riscv/insns/csrrc.h
+++ b/riscv/insns/csrrc.h
@@ -1,4 +1,4 @@
 int csr = validate_csr(insn.csr(), true);
 reg_t old = p->get_pcr(csr);
 p->set_pcr(csr, old & ~RS1);
-WRITE_RD(sext_xprlen(old));
+WRITE_RD(sext_xlen(old));
diff --git a/riscv/insns/csrrci.h b/riscv/insns/csrrci.h
index 51a2cde..172aea0 100644
--- a/riscv/insns/csrrci.h
+++ b/riscv/insns/csrrci.h
@@ -1,4 +1,4 @@
 int csr = validate_csr(insn.csr(), true);
 reg_t old = p->get_pcr(csr);
 p->set_pcr(csr, old & ~(reg_t)insn.rs1());
-WRITE_RD(sext_xprlen(old));
+WRITE_RD(sext_xlen(old));
diff --git a/riscv/insns/csrrs.h b/riscv/insns/csrrs.h
index 675cb86..6616855 100644
--- a/riscv/insns/csrrs.h
+++ b/riscv/insns/csrrs.h
@@ -1,4 +1,4 @@
 int csr = validate_csr(insn.csr(), insn.rs1() != 0);
 reg_t old = p->get_pcr(csr);
 p->set_pcr(csr, old | RS1);
-WRITE_RD(sext_xprlen(old));
+WRITE_RD(sext_xlen(old));
diff --git a/riscv/insns/csrrsi.h b/riscv/insns/csrrsi.h
index 094e91a..913c20a 100644
--- a/riscv/insns/csrrsi.h
+++ b/riscv/insns/csrrsi.h
@@ -1,4 +1,4 @@
 int csr = validate_csr(insn.csr(), true);
 reg_t old = p->get_pcr(csr);
 p->set_pcr(csr, old | insn.rs1());
-WRITE_RD(sext_xprlen(old));
+WRITE_RD(sext_xlen(old));
diff --git a/riscv/insns/csrrw.h b/riscv/insns/csrrw.h
index 3d1ea32..b981665 100644
--- a/riscv/insns/csrrw.h
+++ b/riscv/insns/csrrw.h
@@ -1,4 +1,4 @@
 int csr = validate_csr(insn.csr(), true);
 reg_t old = p->get_pcr(csr);
 p->set_pcr(csr, RS1);
-WRITE_RD(sext_xprlen(old));
+WRITE_RD(sext_xlen(old));
diff --git a/riscv/insns/csrrwi.h b/riscv/insns/csrrwi.h
index 081b4e9..cbee6b9 100644
--- a/riscv/insns/csrrwi.h
+++ b/riscv/insns/csrrwi.h
@@ -1,4 +1,4 @@
 int csr = validate_csr(insn.csr(), true);
 reg_t old = p->get_pcr(csr);
 p->set_pcr(csr, insn.rs1());
-WRITE_RD(sext_xprlen(old));
+WRITE_RD(sext_xlen(old));
diff --git a/riscv/insns/div.h b/riscv/insns/div.h
index 261880f..3ad613a 100644
--- a/riscv/insns/div.h
+++ b/riscv/insns/div.h
@@ -1,8 +1,8 @@
-sreg_t lhs = sext_xprlen(RS1);
-sreg_t rhs = sext_xprlen(RS2);
+sreg_t lhs = sext_xlen(RS1);
+sreg_t rhs = sext_xlen(RS2);
 if(rhs == 0)
   WRITE_RD(UINT64_MAX);
 else if(lhs == INT64_MIN && rhs == -1)
   WRITE_RD(lhs);
 else
-  WRITE_RD(sext_xprlen(lhs / rhs));
+  WRITE_RD(sext_xlen(lhs / rhs));
diff --git a/riscv/insns/divu.h b/riscv/insns/divu.h
index fd878a2..4887ce0 100644
--- a/riscv/insns/divu.h
+++ b/riscv/insns/divu.h
@@ -1,6 +1,6 @@
-reg_t lhs = zext_xprlen(RS1);
-reg_t rhs = zext_xprlen(RS2);
+reg_t lhs = zext_xlen(RS1);
+reg_t rhs = zext_xlen(RS2);
 if(rhs == 0)
   WRITE_RD(UINT64_MAX);
 else
-  WRITE_RD(sext_xprlen(lhs / rhs));
+  WRITE_RD(sext_xlen(lhs / rhs));
diff --git a/riscv/insns/mul.h b/riscv/insns/mul.h
index 9725bfd..c6b5331 100644
--- a/riscv/insns/mul.h
+++ b/riscv/insns/mul.h
@@ -1 +1 @@
-WRITE_RD(sext_xprlen(RS1 * RS2));
+WRITE_RD(sext_xlen(RS1 * RS2));
diff --git a/riscv/insns/rem.h b/riscv/insns/rem.h
index fa98ac6..d074f26 100644
--- a/riscv/insns/rem.h
+++ b/riscv/insns/rem.h
@@ -1,8 +1,8 @@
-sreg_t lhs = sext_xprlen(RS1);
-sreg_t rhs = sext_xprlen(RS2);
+sreg_t lhs = sext_xlen(RS1);
+sreg_t rhs = sext_xlen(RS2);
 if(rhs == 0)
   WRITE_RD(lhs);
 else if(lhs == INT64_MIN && rhs == -1)
   WRITE_RD(0);
 else
-  WRITE_RD(sext_xprlen(lhs % rhs));
+  WRITE_RD(sext_xlen(lhs % rhs));
diff --git a/riscv/insns/remu.h b/riscv/insns/remu.h
index 646bb3a..c291947 100644
--- a/riscv/insns/remu.h
+++ b/riscv/insns/remu.h
@@ -1,6 +1,6 @@
-reg_t lhs = zext_xprlen(RS1);
-reg_t rhs = zext_xprlen(RS2);
+reg_t lhs = zext_xlen(RS1);
+reg_t rhs = zext_xlen(RS2);
 if(rhs == 0)
-  WRITE_RD(sext_xprlen(RS1));
+  WRITE_RD(sext_xlen(RS1));
 else
-  WRITE_RD(sext_xprlen(lhs % rhs));
+  WRITE_RD(sext_xlen(lhs % rhs));
diff --git a/riscv/insns/sll.h b/riscv/insns/sll.h
index 48c0acf..7db7613 100644
--- a/riscv/insns/sll.h
+++ b/riscv/insns/sll.h
@@ -1 +1 @@
-WRITE_RD(sext_xprlen(RS1 << (RS2 & (xprlen-1))));
+WRITE_RD(sext_xlen(RS1 << (RS2 & (xlen-1))));
diff --git a/riscv/insns/sra.h b/riscv/insns/sra.h
index 45c9657..403b9b7 100644
--- a/riscv/insns/sra.h
+++ b/riscv/insns/sra.h
@@ -1 +1 @@
-WRITE_RD(sext_xprlen(sext_xprlen(RS1) >> (RS2 & (xprlen-1))));
+WRITE_RD(sext_xlen(sext_xlen(RS1) >> (RS2 & (xlen-1))));
diff --git a/riscv/insns/sub.h b/riscv/insns/sub.h
index 95fb83e..9ed48f7 100644
--- a/riscv/insns/sub.h
+++ b/riscv/insns/sub.h
@@ -1 +1 @@
-WRITE_RD(sext_xprlen(RS1 - RS2));
+WRITE_RD(sext_xlen(RS1 - RS2));