From 2b0f6c22836c2a50c8be996c824bc8faef643273 Mon Sep 17 00:00:00 2001
From: munailwaqar <munail.waqar@10xengineers.ai>
Date: Tue, 10 Dec 2024 15:47:57 +0500
Subject: [PATCH] decoder issue fix

---
 core/decoder.sv | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/decoder.sv b/core/decoder.sv
index 615e491df3..efe8fa2a1f 100644
--- a/core/decoder.sv
+++ b/core/decoder.sv
@@ -862,17 +862,11 @@ module decoder
                 // Bitwise Shifting
                 {7'b011_0000, 3'b001} : instruction_o.op = ariane_pkg::ROLW;  // rolw
                 {7'b011_0000, 3'b101} : instruction_o.op = ariane_pkg::RORW;  // rorw
-                // Pack_W
-                {
-                  7'b000_0100, 3'b100
-                } :
-                if (CVA6Cfg.ZKN) instruction_o.op = ariane_pkg::PACK_W;
-                else illegal_instr_bm = 1'b1;  //packw
-                // Zero Extend Op RV64 encoding
                 {
                   7'b000_0100, 3'b100
                 } : begin
-                  if (instr.instr[24:20] == 5'b00000) instruction_o.op = ariane_pkg::ZEXTH;
+                  if (instr.instr[24:20] == 5'b00000) instruction_o.op = ariane_pkg::ZEXTH;  // Zero Extend Op RV64 encoding
+                  else if (CVA6Cfg.ZKN) instruction_o.op = ariane_pkg::PACK_W;  // packw
                   else illegal_instr_bm = 1'b1;
                 end
                 default: illegal_instr_bm = 1'b1;