From 58f739bf3f91180678395ab3dbd1ee27e0e15e96 Mon Sep 17 00:00:00 2001
From: Kevin Broch <kbroch@rivosinc.com>
Date: Wed, 13 Nov 2024 14:15:34 -0800
Subject: [PATCH 1/2] fix duplicate `not` keyword

fixes #264
---
 arch/inst/C/c.lui.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/inst/C/c.lui.yaml b/arch/inst/C/c.lui.yaml
index ffba4e470..ccdca54c5 100644
--- a/arch/inst/C/c.lui.yaml
+++ b/arch/inst/C/c.lui.yaml
@@ -3,9 +3,9 @@
 c.lui:
   long_name: Load the non-zero 6-bit immediate field into bits 17–12 of the destination register
   description: |
-    C.LUI loads the non-zero 6-bit immediate field into bits 17–12 of the destination register, clears the bottom 12 bits, and sign-extends bit 17 into all higher bits of the destination. 
-    C.LUI expands into `lui rd, imm`. 
-    C.LUI is only valid when rd≠x0 and rd≠x2, and when the immediate is not equal to zero. 
+    C.LUI loads the non-zero 6-bit immediate field into bits 17–12 of the destination register, clears the bottom 12 bits, and sign-extends bit 17 into all higher bits of the destination.
+    C.LUI expands into `lui rd, imm`.
+    C.LUI is only valid when rd≠x0 and rd≠x2, and when the immediate is not equal to zero.
     The code points with imm=0 are reserved; the remaining code points with rd=x0 are HINTs; and the remaining code points with rd=x2 correspond to the C.ADDI16SP instruction
   definedBy:
     anyOf:
@@ -20,8 +20,7 @@ c.lui:
       left_shift: 12
     - name: rd
       location: 11-7
-      not: 0
-      not: 2
+      not: [0, 2]
   access:
     s: always
     u: always
@@ -33,4 +32,3 @@ c.lui:
     }
 
     X[rd] = imm;
-

From 3b56a03619fdfddee189ba248f33f8cc774cee7b Mon Sep 17 00:00:00 2001
From: Derek Hower <quic_dhower@quicinc.com>
Date: Thu, 14 Nov 2024 09:37:29 -0800
Subject: [PATCH 2/2] instruction bugfix

---
 lib/arch_obj_models/instruction.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/arch_obj_models/instruction.rb b/lib/arch_obj_models/instruction.rb
index 92c9a7640..8daaa54be 100644
--- a/lib/arch_obj_models/instruction.rb
+++ b/lib/arch_obj_models/instruction.rb
@@ -289,7 +289,7 @@ def pretty_name
       elsif excludes.size == 1
         "#{name} != #{excludes[0]}"
       else
-        "#{name} != {#{excludes[0].join(',')}}"
+        "#{name} != {#{excludes.join(',')}}"
       end
     end