From 000d203da89ffe222bb73a56ff1dc5cb4d7bbcb0 Mon Sep 17 00:00:00 2001
From: plucky <m202372036@hust.edu.cn>
Date: Tue, 14 Nov 2023 16:56:29 +0800
Subject: [PATCH] =?UTF-8?q?asm/rv32i:=20=E6=8C=87=E4=BB=A4=E9=9B=86?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0From=E7=BA=A6=E6=9D=9F?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAInto=E7=BA=A6=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根据标准库的建议，通常应优先使用Into而不是From，特别是在为泛型函数指定特征边界时，因为有的类型只实现了Into，而实现From会自动获得Into的实现，这是为了确保只实现了Into的类型也能够被使用。

Signed-off-by: plucky <m202372036@hust.edu.cn>
---
 src/asm/rv32i.rs | 286 +++++++++++++++++++++++++----------------------
 1 file changed, 152 insertions(+), 134 deletions(-)

diff --git a/src/asm/rv32i.rs b/src/asm/rv32i.rs
index c888acd..56bc456 100644
--- a/src/asm/rv32i.rs
+++ b/src/asm/rv32i.rs
@@ -167,23 +167,31 @@ impl fmt::Debug for InsnRV32Priv {
     }
 }
 
-pub fn lui<T: From<InsnRV32I>>(rd: RegInteger, simm20: impl Into<IntSigned<20, 0>>) -> T {
+pub fn lui<T>(rd: RegInteger, simm20: impl Into<IntSigned<20, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Lui(UType::new(OPCODE_LUI, rd, simm20.into())).into()
 }
 
-pub fn auipc<T: From<InsnRV32I>>(rd: RegInteger, simm20: impl Into<IntSigned<20, 0>>) -> T {
+pub fn auipc<T>(rd: RegInteger, simm20: impl Into<IntSigned<20, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Auipc(UType::new(OPCODE_AUIPC, rd, simm20.into())).into()
 }
 
-pub fn jal<T: From<InsnRV32I>>(rd: RegInteger, offset: impl Into<IntSigned<21, 1>>) -> T {
+pub fn jal<T>(rd: RegInteger, offset: impl Into<IntSigned<21, 1>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Jal(JType::new(OPCODE_JAL, rd, offset.into())).into()
 }
 
-pub fn jalr<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn jalr<T>(rd: RegInteger, rs1: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Jalr(IType::new(
         OPCODE_JALR,
         FUNCT3_JALR_JALR,
@@ -194,11 +202,10 @@ pub fn jalr<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn beq<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<13, 1>>,
-) -> T {
+pub fn beq<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<13, 1>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Beq(BType::new(
         OPCODE_BRANCH,
         FUNCT3_BRANCH_BEQ,
@@ -209,11 +216,10 @@ pub fn beq<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn bne<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<13, 1>>,
-) -> T {
+pub fn bne<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<13, 1>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Bne(BType::new(
         OPCODE_BRANCH,
         FUNCT3_BRANCH_BNE,
@@ -224,11 +230,10 @@ pub fn bne<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn blt<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<13, 1>>,
-) -> T {
+pub fn blt<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<13, 1>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Blt(BType::new(
         OPCODE_BRANCH,
         FUNCT3_BRANCH_BLT,
@@ -239,11 +244,10 @@ pub fn blt<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn bge<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<13, 1>>,
-) -> T {
+pub fn bge<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<13, 1>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Bge(BType::new(
         OPCODE_BRANCH,
         FUNCT3_BRANCH_BGE,
@@ -254,11 +258,10 @@ pub fn bge<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn bltu<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<13, 1>>,
-) -> T {
+pub fn bltu<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<13, 1>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Bltu(BType::new(
         OPCODE_BRANCH,
         FUNCT3_BRANCH_BLTU,
@@ -269,11 +272,10 @@ pub fn bltu<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn bgeu<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<13, 1>>,
-) -> T {
+pub fn bgeu<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<13, 1>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Bgeu(BType::new(
         OPCODE_BRANCH,
         FUNCT3_BRANCH_BGEU,
@@ -284,11 +286,10 @@ pub fn bgeu<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn lb<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn lb<T>(rd: RegInteger, rs1: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Lb(IType::new(
         OPCODE_LOAD,
         FUNCT3_LOAD_LB,
@@ -299,11 +300,10 @@ pub fn lb<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn lh<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn lh<T>(rd: RegInteger, rs1: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Lh(IType::new(
         OPCODE_LOAD,
         FUNCT3_LOAD_LH,
@@ -314,11 +314,10 @@ pub fn lh<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn lw<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn lw<T>(rd: RegInteger, rs1: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Lw(IType::new(
         OPCODE_LOAD,
         FUNCT3_LOAD_LW,
@@ -329,11 +328,10 @@ pub fn lw<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn lbu<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn lbu<T>(rd: RegInteger, rs1: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Lbu(IType::new(
         OPCODE_LOAD,
         FUNCT3_LOAD_LBU,
@@ -344,11 +342,10 @@ pub fn lbu<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn lhu<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn lhu<T>(rd: RegInteger, rs1: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Lhu(IType::new(
         OPCODE_LOAD,
         FUNCT3_LOAD_LHU,
@@ -359,11 +356,10 @@ pub fn lhu<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn sb<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn sb<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Sb(SType::new(
         OPCODE_STORE,
         FUNCT3_STORE_SB,
@@ -374,11 +370,10 @@ pub fn sb<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn sh<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn sh<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Sh(SType::new(
         OPCODE_STORE,
         FUNCT3_STORE_SH,
@@ -389,11 +384,10 @@ pub fn sh<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn sw<T: From<InsnRV32I>>(
-    rs1: RegInteger,
-    rs2: RegInteger,
-    offset: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn sw<T>(rs1: RegInteger, rs2: RegInteger, offset: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Sw(SType::new(
         OPCODE_STORE,
         FUNCT3_STORE_SW,
@@ -404,7 +398,10 @@ pub fn sw<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn add<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn add<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Add(RType::new(
         OPCODE_OP,
         FUNCT3_OP_ADD_SUB,
@@ -416,7 +413,10 @@ pub fn add<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
     .into()
 }
 
-pub fn sub<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn sub<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Sub(RType::new(
         OPCODE_OP,
         FUNCT3_OP_ADD_SUB,
@@ -428,7 +428,10 @@ pub fn sub<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
     .into()
 }
 
-pub fn sll<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn sll<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Sll(RType::new(
         OPCODE_OP,
         FUNCT3_OP_SLL,
@@ -440,7 +443,10 @@ pub fn sll<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
     .into()
 }
 
-pub fn slt<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn slt<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Slt(RType::new(
         OPCODE_OP,
         FUNCT3_OP_SLT,
@@ -452,7 +458,10 @@ pub fn slt<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
     .into()
 }
 
-pub fn sltu<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn sltu<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Sltu(RType::new(
         OPCODE_OP,
         FUNCT3_OP_SLTU,
@@ -464,7 +473,10 @@ pub fn sltu<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger
     .into()
 }
 
-pub fn xor<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn xor<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Xor(RType::new(
         OPCODE_OP,
         FUNCT3_OP_XOR,
@@ -476,7 +488,10 @@ pub fn xor<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
     .into()
 }
 
-pub fn srl<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn srl<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Srl(RType::new(
         OPCODE_OP,
         FUNCT3_OP_SRL_SRA,
@@ -488,7 +503,10 @@ pub fn srl<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
     .into()
 }
 
-pub fn sra<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn sra<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Sra(RType::new(
         OPCODE_OP,
         FUNCT3_OP_SRL_SRA,
@@ -500,7 +518,10 @@ pub fn sra<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
     .into()
 }
 
-pub fn or<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn or<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Or(RType::new(
         OPCODE_OP,
         FUNCT3_OP_OR,
@@ -512,7 +533,10 @@ pub fn or<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
     .into()
 }
 
-pub fn and<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T {
+pub fn and<T>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::And(RType::new(
         OPCODE_OP,
         FUNCT3_OP_AND,
@@ -525,11 +549,10 @@ pub fn and<T: From<InsnRV32I>>(rd: RegInteger, rs1: RegInteger, rs2: RegInteger)
 }
 
 /// Add sign-extended 12-bit immediate to source register, ignoring the arithmetic overflow.
-pub fn addi<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    simm12: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn addi<T>(rd: RegInteger, rs1: RegInteger, simm12: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Addi(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_ADD_SUB,
@@ -541,11 +564,10 @@ pub fn addi<T: From<InsnRV32I>>(
 }
 
 /// If signed value in source register is less than the sign-extended immediate, place the value 1 into destination.
-pub fn slti<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    simm12: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn slti<T>(rd: RegInteger, rs1: RegInteger, simm12: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Slti(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_SLT,
@@ -557,11 +579,10 @@ pub fn slti<T: From<InsnRV32I>>(
 }
 
 /// If unsigned value in source register is less than the sign-extended immediate, place the value 1 into destination.
-pub fn sltiu<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    simm12: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn sltiu<T>(rd: RegInteger, rs1: RegInteger, simm12: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Sltiu(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_SLTU,
@@ -573,11 +594,10 @@ pub fn sltiu<T: From<InsnRV32I>>(
 }
 
 /// Perform logical 'xor' on source register and sign-extended immediate.
-pub fn xori<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    simm12: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn xori<T>(rd: RegInteger, rs1: RegInteger, simm12: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Xori(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_XOR,
@@ -589,11 +609,10 @@ pub fn xori<T: From<InsnRV32I>>(
 }
 
 /// Perform logical 'or' on source register and sign-extended immediate.
-pub fn ori<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    simm12: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn ori<T>(rd: RegInteger, rs1: RegInteger, simm12: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Ori(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_OR,
@@ -605,11 +624,10 @@ pub fn ori<T: From<InsnRV32I>>(
 }
 
 /// Perform logical 'and' on source register and sign-extended immediate.
-pub fn andi<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    simm12: impl Into<IntSigned<12, 0>>,
-) -> T {
+pub fn andi<T>(rd: RegInteger, rs1: RegInteger, simm12: impl Into<IntSigned<12, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Andi(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_AND,
@@ -620,11 +638,10 @@ pub fn andi<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn slli<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    shamt: impl Into<IntUnsigned<5, 0>>,
-) -> T {
+pub fn slli<T>(rd: RegInteger, rs1: RegInteger, shamt: impl Into<IntUnsigned<5, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Slli(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_SLL,
@@ -635,11 +652,10 @@ pub fn slli<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn srli<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    shamt: impl Into<IntUnsigned<5, 0>>,
-) -> T {
+pub fn srli<T>(rd: RegInteger, rs1: RegInteger, shamt: impl Into<IntUnsigned<5, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Srli(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_SRL_SRA,
@@ -650,11 +666,10 @@ pub fn srli<T: From<InsnRV32I>>(
     .into()
 }
 
-pub fn srai<T: From<InsnRV32I>>(
-    rd: RegInteger,
-    rs1: RegInteger,
-    shamt: impl Into<IntUnsigned<5, 0>>,
-) -> T {
+pub fn srai<T>(rd: RegInteger, rs1: RegInteger, shamt: impl Into<IntUnsigned<5, 0>>) -> T
+where
+    InsnRV32I: Into<T>,
+{
     InsnRV32I::Srai(IType::new(
         OPCODE_OP_IMM,
         FUNCT3_OP_SRL_SRA,
@@ -669,7 +684,10 @@ pub mod pseudo {
     use super::{addi, InsnRV32I};
     use crate::asm::RegInteger;
 
-    pub fn mv<T: From<InsnRV32I>>(rd: RegInteger, rs: RegInteger) -> T {
+    pub fn mv<T>(rd: RegInteger, rs: RegInteger) -> T
+    where
+        InsnRV32I: Into<T>,
+    {
         addi(rd, rs, 0)
     }
 
-- 
Gitee