[v8,04/17] target/riscv: additional code information for sw check

Commit Message

Deepak Gupta Aug. 23, 2024, 7:01 p.m. UTC

sw check exception support was recently added. This patch further augments
sw check exception by providing support for additional code which is
provided in *tval. Adds `sw_check_code` field in cpuarchstate. Whenever
sw check exception is raised *tval gets the value deposited in
`sw_check_code`.

Signed-off-by: Deepak Gupta <[e-mail]>
Reviewed-by: Richard Henderson <[e-mail]>
---
 target/riscv/cpu.h        | 2 ++
 target/riscv/cpu_helper.c | 2 ++
 target/riscv/csr.c        | 1 +
 3 files changed, 5 insertions(+)

Comments

Richard Henderson Aug. 25, 2024, 11:59 p.m. UTC | #1

On 8/24/24 05:01, Deepak Gupta wrote:
> diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
> index 12484ca7d2..9f08a67a9e 100644
> --- a/target/riscv/cpu_helper.c
> +++ b/target/riscv/cpu_helper.c
> @@ -1761,6 +1761,8 @@ void riscv_cpu_do_interrupt(CPUState *cs)
>                   cs->watchpoint_hit = NULL;
>               }
>               break;
> +        case RISCV_EXCP_SW_CHECK:
> +            tval = env->sw_check_code;
>           default:

Missing break.
This should have warned about fall through...



r~

Deepak Gupta Aug. 26, 2024, 3:17 p.m. UTC | #2

On Mon, Aug 26, 2024 at 09:59:55AM +1000, Richard Henderson wrote:
>On 8/24/24 05:01, Deepak Gupta wrote:
>>diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
>>index 12484ca7d2..9f08a67a9e 100644
>>--- a/target/riscv/cpu_helper.c
>>+++ b/target/riscv/cpu_helper.c
>>@@ -1761,6 +1761,8 @@ void riscv_cpu_do_interrupt(CPUState *cs)
>>                  cs->watchpoint_hit = NULL;
>>              }
>>              break;
>>+        case RISCV_EXCP_SW_CHECK:
>>+            tval = env->sw_check_code;
>>          default:
>
>Missing break.
>This should have warned about fall through...

Strange, I didn't get warning on it.
But will fix it.

>
>
>
>r~

Patch

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 7be0fa30f7..11c6513a90 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -224,6 +224,8 @@  struct CPUArchState {
 
     /* elp state for zicfilp extension */
     bool      elp;
+    /* sw check code for sw check exception */
+    target_ulong sw_check_code;
 #ifdef CONFIG_USER_ONLY
     uint32_t elf_flags;
     bool ufcfien;
diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index 12484ca7d2..9f08a67a9e 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -1761,6 +1761,8 @@  void riscv_cpu_do_interrupt(CPUState *cs)
                 cs->watchpoint_hit = NULL;
             }
             break;
+        case RISCV_EXCP_SW_CHECK:
+            tval = env->sw_check_code;
         default:
             break;
         }
diff --git a/target/riscv/csr.c b/target/riscv/csr.c
index 5771a14848..a5a969a377 100644
--- a/target/riscv/csr.c
+++ b/target/riscv/csr.c
@@ -1179,6 +1179,7 @@  static const uint64_t all_ints = M_MODE_INTERRUPTS | S_MODE_INTERRUPTS |
                          (1ULL << (RISCV_EXCP_INST_PAGE_FAULT)) | \
                          (1ULL << (RISCV_EXCP_LOAD_PAGE_FAULT)) | \
                          (1ULL << (RISCV_EXCP_STORE_PAGE_FAULT)) | \
+                         (1ULL << (RISCV_EXCP_SW_CHECK)) | \
                          (1ULL << (RISCV_EXCP_INST_GUEST_PAGE_FAULT)) | \
                          (1ULL << (RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT)) | \
                          (1ULL << (RISCV_EXCP_VIRT_INSTRUCTION_FAULT)) | \