From 14c25a383cfbb5e76e041ef13763abbe020cf5ed Mon Sep 17 00:00:00 2001
From: zmckevitt <zack.mckevitt@gmail.com>
Date: Thu, 29 Jun 2023 23:23:02 +0000
Subject: [PATCH] arch-riscv: Implemented zicbom/zicboz extensions for RISC V

Change-Id: I79d0e6059a2dbb5a0057c4f7489b999f9e803684
---
 src/arch/riscv/isa/decoder.isa     | 17 +++++++++++++++++
 src/arch/riscv/isa/formats/mem.isa |  7 +++++++
 2 files changed, 24 insertions(+)

diff --git a/src/arch/riscv/isa/decoder.isa b/src/arch/riscv/isa/decoder.isa
index d34adfaa02..71efac5958 100644
--- a/src/arch/riscv/isa/decoder.isa
+++ b/src/arch/riscv/isa/decoder.isa
@@ -677,6 +677,23 @@ decode QUADRANT default Unknown::unknown() {
                 0x1: fence_i({{
                 }}, uint64_t, IsNonSpeculative, IsSerializeAfter, No_OpClass);
             }
+
+            0x2: decode FUNCT12 {
+                format CBMOp {
+                    0x0: cbo_inval({{
+                        Mem = 0;
+                    }}, mem_flags=[INVALIDATE, DST_POC]);
+                    0x1: cbo_clean({{
+                        Mem = 0;
+                    }}, mem_flags=[CLEAN, DST_POC]);
+                    0x2: cbo_flush({{
+                        Mem = 0;
+                    }}, mem_flags=[CLEAN, INVALIDATE, DST_POC]);
+                    0x4: cbo_zero({{
+                        Mem = 0;
+                    }}, mem_flags=[CACHE_BLOCK_ZERO]);
+                }
+            }
         }
 
         0x04: decode FUNCT3 {
diff --git a/src/arch/riscv/isa/formats/mem.isa b/src/arch/riscv/isa/formats/mem.isa
index 0d80260a25..7cec113ba1 100644
--- a/src/arch/riscv/isa/formats/mem.isa
+++ b/src/arch/riscv/isa/formats/mem.isa
@@ -243,3 +243,10 @@ def format Store(memacc_code, ea_code={{EA = rvZext(Rs1 + offset);}},
         LoadStoreBase(name, Name, offset_code, ea_code, memacc_code, mem_flags,
         inst_flags, 'Store', exec_template_base='Store')
 }};
+
+def format CBMOp(memacc_code, ea_code={{EA = rvZext(Rs1 + offset);}},
+        offset_code={{offset = 0;}}, mem_flags=[], inst_flags=[]) {{
+    (header_output, decoder_output, decode_block, exec_output) = \
+        LoadStoreBase(name, Name, offset_code, ea_code, memacc_code, mem_flags,
+        inst_flags, 'Store', exec_template_base='Store')
+}};