From 38033a078ac69f14f3d1d9c18f791c0362282d17 Mon Sep 17 00:00:00 2001
From: Petr Vesely <petr.vesely@codasip.com>
Date: Wed, 24 Jan 2024 11:55:56 +0000
Subject: [PATCH 1/2] [RISCV-CHERI] Fix description of CSetMode

---
 src/insns/wavedrom/csetmode.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/insns/wavedrom/csetmode.adoc b/src/insns/wavedrom/csetmode.adoc
index 42e469ea..ad8fb9c1 100644
--- a/src/insns/wavedrom/csetmode.adoc
+++ b/src/insns/wavedrom/csetmode.adoc
@@ -6,7 +6,7 @@
   {bits: 5,  name: 'cd',      attr: ['5', 'dest'], type: 2},
   {bits: 3,  name: 'funct3',  attr: ['3', 'CSETMODE=000'], type: 8},
   {bits: 5,  name: 'cs1',     attr: ['5', 'src1'], type: 4},
-  {bits: 5,  name: 'rs2',     attr: ['5', 'CSETMODE=0011'], type: 3},
+  {bits: 5,  name: 'rs2',     attr: ['5', 'mode'], type: 3},
   {bits: 7,  name: 'funct7',  attr: ['7', 'CSETMODE=0001000'], type: 3},
 ]}
 ....

From 86d2123b8db17c48cb13ffea56e7df98cbee369c Mon Sep 17 00:00:00 2001
From: Tariq Kurd <tariq.kurd@codasip.com>
Date: Wed, 24 Jan 2024 14:30:56 +0100
Subject: [PATCH 2/2] move encoding to allow rs2, and match risc-v opcodes

---
 src/insns/wavedrom/csetmode.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/insns/wavedrom/csetmode.adoc b/src/insns/wavedrom/csetmode.adoc
index ad8fb9c1..8adbb7c4 100644
--- a/src/insns/wavedrom/csetmode.adoc
+++ b/src/insns/wavedrom/csetmode.adoc
@@ -4,9 +4,9 @@
 {reg: [
   {bits: 7,  name: 'opcode',  attr: ['7', 'OP=0110011'], type: 8},
   {bits: 5,  name: 'cd',      attr: ['5', 'dest'], type: 2},
-  {bits: 3,  name: 'funct3',  attr: ['3', 'CSETMODE=000'], type: 8},
+  {bits: 3,  name: 'funct3',  attr: ['7', 'CSETMODE=111'], type: 8},
   {bits: 5,  name: 'cs1',     attr: ['5', 'src1'], type: 4},
-  {bits: 5,  name: 'rs2',     attr: ['5', 'mode'], type: 3},
-  {bits: 7,  name: 'funct7',  attr: ['7', 'CSETMODE=0001000'], type: 3},
+  {bits: 5,  name: 'rs2',     attr: ['5', 'src2'], type: 3},
+  {bits: 7,  name: 'funct7',  attr: ['7', 'CSETMODE=0000110'], type: 3},
 ]}
 ....