[Qemu-devel] [PATCH for-4.1 1/8] target/riscv: Name the argument sets for all of insn32 formats

[Richard Henderson]

Signed-off-by: Richard Henderson <address@hidden>
---
 target/riscv/insn32.decode | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode
index 6f3ab7aa52..77f794ed70 100644
--- a/target/riscv/insn32.decode
+++ b/target/riscv/insn32.decode
@@ -34,9 +34,13 @@
 %imm_u    12:s20                 !function=ex_shift_12
 
 # Argument sets:
+&empty
 &b    imm rs2 rs1
 &i    imm rs1 rd
+&j    imm rd
 &r    rd rs1 rs2
+&s    imm rs1 rs2
+&u    imm rd
 &shift     shamt rs1 rd
 &atomic    aq rl rs2 rs1 rd
 
@@ -44,9 +48,9 @@
 @r       .......   ..... ..... ... ..... ....... &r                %rs2 %rs1 
%rd
 @i       ............    ..... ... ..... ....... &i      imm=%imm_i     %rs1 
%rd
 @b       .......   ..... ..... ... ..... ....... &b      imm=%imm_b %rs2 %rs1
address@hidden       .......   ..... ..... ... ..... .......         imm=%imm_s 
%rs2 %rs1
address@hidden       ....................      ..... .......         imm=%imm_u 
         %rd
address@hidden       ....................      ..... .......         imm=%imm_j 
         %rd
address@hidden       .......   ..... ..... ... ..... ....... &s      imm=%imm_s 
%rs2 %rs1
address@hidden       ....................      ..... ....... &u      imm=%imm_u 
         %rd
address@hidden       ....................      ..... ....... &j      imm=%imm_j 
         %rd
 
 @sh      ......  ...... .....  ... ..... ....... &shift  shamt=%sh10      %rs1 
%rd
 @csr     ............   .....  ... ..... .......               %csr     %rs1 
%rd
-- 
2.17.1