From 18532c64663477f823c6ceabffe3afcf7c76fd66 Mon Sep 17 00:00:00 2001
From: Tariq Kurd <tariq.kurd@codasip.com>
Date: Thu, 25 Jan 2024 09:01:24 +0100
Subject: [PATCH 1/2] fixed prerequisite rules for 16-bit fp dp load/store

---
 src/insns/load_16bit_fp_dp.adoc  | 6 ++++--
 src/insns/store_16bit_fp_dp.adoc | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/insns/load_16bit_fp_dp.adoc b/src/insns/load_16bit_fp_dp.adoc
index 883cd998..37cc1787 100644
--- a/src/insns/load_16bit_fp_dp.adoc
+++ b/src/insns/load_16bit_fp_dp.adoc
@@ -52,10 +52,12 @@ Standard floating point stack pointer relative load instructions, authorised by
 include::load_exceptions.adoc[]
 
 Prerequisites for C.CFLD, C.CFLDSP (RV32 only)::
-{c_cheri_base_ext_names}, and Zcd or D
+{cheri_base_ext_name}, C and D
+{cheri_base_ext_name}, Zca and Zcd
 
 Prerequisites for C.FLD, C.FLDSP::
-{c_cheri_legacy_ext_names}, and Zcd or D
+{cheri_base_ext_name}, C and D
+{cheri_base_ext_name}, Zca and Zcd
 
 Operation (after expansion to 32-bit encodings)::
  See <<FLD>>
diff --git a/src/insns/store_16bit_fp_dp.adoc b/src/insns/store_16bit_fp_dp.adoc
index 9cf008ed..85d7314e 100644
--- a/src/insns/store_16bit_fp_dp.adoc
+++ b/src/insns/store_16bit_fp_dp.adoc
@@ -52,10 +52,12 @@ Standard floating point stack pointer relative store instructions, authorised by
 include::store_exceptions.adoc[]
 
 Prerequisites for C.CFSD, C.CFSDSP (RV32 only)::
-{c_cheri_base_ext_names}, and Zcd or D
+{cheri_base_ext_name}, C and D
+{cheri_base_ext_name}, Zca and Zcd
 
 Prerequisites for C.FSD, C.FSDSP::
-{c_cheri_legacy_ext_names}, and Zcd or D
+{cheri_legacy_ext_name}, C and D
+{cheri_legacy_ext_name}, Zca and Zcd
 
 Operation (after expansion to 32-bit encodings)::
  See <<CFSD>>, <<FSD>>

From fe7306b20f087e1eb6e66e0a56afbcb631da65e4 Mon Sep 17 00:00:00 2001
From: Andres Amaya Garcia <andres.amaya@codasip.com>
Date: Thu, 25 Jan 2024 10:29:05 +0000
Subject: [PATCH 2/2] Fix adoc formatting for ld/st fp d prerequisites

---
 src/insns/load_16bit_fp_dp.adoc  | 4 ++--
 src/insns/store_16bit_fp_dp.adoc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/insns/load_16bit_fp_dp.adoc b/src/insns/load_16bit_fp_dp.adoc
index 37cc1787..825d20de 100644
--- a/src/insns/load_16bit_fp_dp.adoc
+++ b/src/insns/load_16bit_fp_dp.adoc
@@ -52,11 +52,11 @@ Standard floating point stack pointer relative load instructions, authorised by
 include::load_exceptions.adoc[]
 
 Prerequisites for C.CFLD, C.CFLDSP (RV32 only)::
-{cheri_base_ext_name}, C and D
+{cheri_base_ext_name}, C and D; or +
 {cheri_base_ext_name}, Zca and Zcd
 
 Prerequisites for C.FLD, C.FLDSP::
-{cheri_base_ext_name}, C and D
+{cheri_base_ext_name}, C and D; or +
 {cheri_base_ext_name}, Zca and Zcd
 
 Operation (after expansion to 32-bit encodings)::
diff --git a/src/insns/store_16bit_fp_dp.adoc b/src/insns/store_16bit_fp_dp.adoc
index 85d7314e..d9452091 100644
--- a/src/insns/store_16bit_fp_dp.adoc
+++ b/src/insns/store_16bit_fp_dp.adoc
@@ -52,11 +52,11 @@ Standard floating point stack pointer relative store instructions, authorised by
 include::store_exceptions.adoc[]
 
 Prerequisites for C.CFSD, C.CFSDSP (RV32 only)::
-{cheri_base_ext_name}, C and D
+{cheri_base_ext_name}, C and D; or +
 {cheri_base_ext_name}, Zca and Zcd
 
 Prerequisites for C.FSD, C.FSDSP::
-{cheri_legacy_ext_name}, C and D
+{cheri_legacy_ext_name}, C and D; or +
 {cheri_legacy_ext_name}, Zca and Zcd
 
 Operation (after expansion to 32-bit encodings)::