Merge pull request #284 from Silabs-ArjanB/ArjanB_wfe1

Corrected instruction set extension chapter with info on custom WFE i…
openhwgroup · Aug 26, 2022 · d002893 · d002893
2 parents 72f6c96 + 3f3b8b4
commit d002893
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/docs/user_manual/source/control_status_registers.rst b/docs/user_manual/source/control_status_registers.rst
@@ -141,7 +141,6 @@ instruction exception.
 .. table:: Control and Status Register Map (additional custom CSRs)
   :name: Control and Status Register Map (additional custom CSRs)
 
-
   +---------------+-------------------+-----------+--------------------------+---------------------------------------------------------+
   |  CSR Address  |   Name            | Privilege | Parameter                |  Description                                            |
   +===============+===================+===========+==========================+=========================================================+
@@ -156,7 +155,6 @@ instruction exception.
   | 0xBFC         | ``secureseed2``   | MRW       |                          | Seed for LFSR2                                          |
   +---------------+-------------------+-----------+--------------------------+---------------------------------------------------------+
 
-
 .. table:: Control and Status Register Map (Unprivileged and User-Level CSRs)
   :name: Control and Status Register Map (Unprivileged and User-Level CSRs)
   :class: no-scrollbar-table

diff --git a/docs/user_manual/source/instruction_set_extensions.rst b/docs/user_manual/source/instruction_set_extensions.rst
@@ -3,4 +3,23 @@
 CORE-V Instruction Set Extensions
 =================================
 
-|corev| does support custom security configuration related CSRs as described in :ref:`cs-registers`. No custom instructions are present.
+Custom instructions
+-------------------
+
+|corev| supports the custom instruction(s) listed in :numref:`Custom instructions`.
+
+.. table:: Custom instructions
+  :name: Custom instructions
+  :widths: 10 10 80
+  :class: no-scrollbar-table
+
+  +-------------------------+-------------+--------------------------------------------------+
+  | Custom instruction      | Encoding    | Description                                      |
+  +=========================+=============+==================================================+
+  | ``wfe``                 | 0x8C00_0073 | Wait For Event, see :ref:`wfe`.                  |
+  +-------------------------+-------------+--------------------------------------------------+
+
+Custom CSRs
+-----------
+
+|corev| supports the custom CSRs listed in :numref:`Control and Status Register Map (additional custom CSRs)`.