Re: [RFC v4 01/16] target/riscv: reformat @sh format encoding for B-extension

2021-01-25 Thread Alistair Francis
On Tue, Jan 12, 2021 at 11:18 PM  wrote:
>
> From: Kito Cheng 
>
> Signed-off-by: Kito Cheng 
> Signed-off-by: Frank Chang 
> Reviewed-by: Richard Henderson 

Reviewed-by: Alistair Francis 

Alistair

> ---
>  target/riscv/insn32.decode | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode
> index 84080dd18ca..3823b3ea800 100644
> --- a/target/riscv/insn32.decode
> +++ b/target/riscv/insn32.decode
> @@ -22,7 +22,7 @@
>  %rs1   15:5
>  %rd7:5
>
> -%sh1020:10
> +%sh720:7
>  %csr20:12
>  %rm 12:3
>  %nf 29:3 !function=ex_plus_1
> @@ -58,7 +58,7 @@
>  @u     . ...   imm=%imm_u  
> %rd
>  @j     . ...   imm=%imm_j  
> %rd
>
> -@sh  ..  .. .  ... . ...   shamt=%sh10  
> %rs1 %rd
> +@sh  ..  .. .  ... . ...   shamt=%sh7 %rs1 
> %rd
>  @csr    .  ... . ...   %csr %rs1 
> %rd
>
>  @atom_ld . aq:1 rl:1 .  . ...  rs2=0 %rs1 
> %rd
> @@ -122,9 +122,9 @@ sltiu . 011 . 0010011 @i
>  xori  . 100 . 0010011 @i
>  ori   . 110 . 0010011 @i
>  andi  . 111 . 0010011 @i
> -slli 00 ... 001 . 0010011 @sh
> -srli 00 ... 101 . 0010011 @sh
> -srai 01 ... 101 . 0010011 @sh
> +slli 0. ... 001 . 0010011 @sh
> +srli 0. ... 101 . 0010011 @sh
> +srai 01000. ... 101 . 0010011 @sh
>  add  000 .. 000 . 0110011 @r
>  sub  010 .. 000 . 0110011 @r
>  sll  000 .. 001 . 0110011 @r
> --
> 2.17.1
>
>



[RFC v4 01/16] target/riscv: reformat @sh format encoding for B-extension

2021-01-12 Thread frank . chang
From: Kito Cheng 

Signed-off-by: Kito Cheng 
Signed-off-by: Frank Chang 
Reviewed-by: Richard Henderson 
---
 target/riscv/insn32.decode | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode
index 84080dd18ca..3823b3ea800 100644
--- a/target/riscv/insn32.decode
+++ b/target/riscv/insn32.decode
@@ -22,7 +22,7 @@
 %rs1   15:5
 %rd7:5
 
-%sh1020:10
+%sh720:7
 %csr20:12
 %rm 12:3
 %nf 29:3 !function=ex_plus_1
@@ -58,7 +58,7 @@
 @u     . ...   imm=%imm_u  
%rd
 @j     . ...   imm=%imm_j  
%rd
 
-@sh  ..  .. .  ... . ...   shamt=%sh10  %rs1 
%rd
+@sh  ..  .. .  ... . ...   shamt=%sh7 %rs1 
%rd
 @csr    .  ... . ...   %csr %rs1 
%rd
 
 @atom_ld . aq:1 rl:1 .  . ...  rs2=0 %rs1 
%rd
@@ -122,9 +122,9 @@ sltiu . 011 . 0010011 @i
 xori  . 100 . 0010011 @i
 ori   . 110 . 0010011 @i
 andi  . 111 . 0010011 @i
-slli 00 ... 001 . 0010011 @sh
-srli 00 ... 101 . 0010011 @sh
-srai 01 ... 101 . 0010011 @sh
+slli 0. ... 001 . 0010011 @sh
+srli 0. ... 101 . 0010011 @sh
+srai 01000. ... 101 . 0010011 @sh
 add  000 .. 000 . 0110011 @r
 sub  010 .. 000 . 0110011 @r
 sll  000 .. 001 . 0110011 @r
-- 
2.17.1