change vector fence names/encoding

1 files changed, 4 insertions, 8 deletions

diff --git a/opcodes b/opcodes
index f79cff8..8104f6f 100644
--- a/opcodes
+++ b/opcodes
@@ -106,6 +106,8 @@ amomaxu.d    rd rs1 rs2 16..10=7 9..7=3 6..2=0x0A 1..0=3
 
 fence.i     rd rs1 imm12 9..7=1 6..2=0x0B 1..0=3
 fence       rd rs1 imm12 9..7=2 6..2=0x0B 1..0=3
+fence.v.l   rd rs1 imm12 9..7=4 6..2=0x0B 1..0=3
+fence.v.g   rd rs1 imm12 9..7=5 6..2=0x0B 1..0=3
 
 syscall   31..27=0 26..22=0 21..17=0 16..10=0 9..7=0 6..2=0x1D 1..0=3
 break     31..27=0 26..22=0 21..17=0 16..10=0 9..7=1 6..2=0x1D 1..0=3
@@ -113,12 +115,6 @@ rdcycle   rd       26..22=0 21..17=0 16..10=0 9..7=4 6..2=0x1D 1..0=3
 rdtime    rd       26..22=0 21..17=0 16..10=1 9..7=4 6..2=0x1D 1..0=3
 rdinstret rd       26..22=0 21..17=0 16..10=2 9..7=4 6..2=0x1D 1..0=3
 
-# vector fence instructions
-fence.l.v   rd rs1 imm12 9..7=4 6..2=0x0B 1..0=3
-fence.g.v   rd rs1 imm12 9..7=5 6..2=0x0B 1..0=3
-fence.l.cv  rd rs1 imm12 9..7=6 6..2=0x0B 1..0=3
-fence.g.cv  rd rs1 imm12 9..7=7 6..2=0x0B 1..0=3
-
 # vector scalar instructions
 stop    31..27=0 26..22=0 21..17=0 16..10=0 9..7=2 6..2=0x1D 1..0=3
 utidx   rd       26..22=0 21..17=0 16..10=0 9..7=3 6..2=0x1D 1..0=3
@@ -134,8 +130,8 @@ mtpcr   31..27=0 rs1      rs2      16..7=3 6..2=0x1E 1..0=3
 eret    31..27=0 26..22=0 21..17=0 16..7=4 6..2=0x1E 1..0=3
 cflush  31..27=0 26..22=0 21..17=0 16..7=5 6..2=0x1E 1..0=3
 
-vxcptsave    31..27=0 26..22=0 21..17=0 16..7=0x200 6..2=0x1E 1..0=3
-vxcptrestore 31..27=0 26..22=0 21..17=0 16..7=0x201 6..2=0x1E 1..0=3
+vxcptsave    31..27=0 rs1      21..17=0 16..7=0x200 6..2=0x1E 1..0=3
+vxcptrestore 31..27=0 rs1      21..17=0 16..7=0x201 6..2=0x1E 1..0=3
 vxcptkill    31..27=0 26..22=0 21..17=0 16..7=0x202 6..2=0x1E 1..0=3
 
 vxcptevac 31..27=0 rs1      21..17=0 16..7=0x300 6..2=0x1E 1..0=3