Skip to content

Commit

Permalink
Updated trap signature area size to check more exceptions in a single…
Browse files Browse the repository at this point in the history
… file
  • Loading branch information
UmerShahidengr committed Sep 18, 2024
1 parent a9b8c6c commit 375c422
Show file tree
Hide file tree
Showing 32 changed files with 150 additions and 199 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
28 changes: 15 additions & 13 deletions riscv-test-suite/rv64i_m/pmm/pmm_basic/PMM_basic_01_S_sv48_tag00.S
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,13 @@ vm_en:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -181,12 +182,13 @@ vm_en_with_pointer_masking:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -239,7 +241,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
25 changes: 13 additions & 12 deletions riscv-test-suite/rv64i_m/pmm/pmm_basic/PMM_basic_01_S_sv48_tag01.S
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ vm_en:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

Expand Down Expand Up @@ -182,12 +182,13 @@ vm_en_with_pointer_masking:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -240,7 +241,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
28 changes: 15 additions & 13 deletions riscv-test-suite/rv64i_m/pmm/pmm_basic/PMM_basic_01_S_sv48_tag10.S
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,13 @@ vm_en:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -181,12 +182,13 @@ vm_en_with_pointer_masking:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -239,7 +241,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
28 changes: 15 additions & 13 deletions riscv-test-suite/rv64i_m/pmm/pmm_basic/PMM_basic_01_S_sv48_tag11.S
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,13 @@ vm_en:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -181,12 +182,13 @@ vm_en_with_pointer_masking:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -239,7 +241,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
28 changes: 15 additions & 13 deletions riscv-test-suite/rv64i_m/pmm/pmm_basic/PMM_basic_01_U_sv48_tag00.S
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,13 @@ vm_en:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -182,12 +183,13 @@ vm_en_with_pointer_masking:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -240,7 +242,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
28 changes: 15 additions & 13 deletions riscv-test-suite/rv64i_m/pmm/pmm_basic/PMM_basic_01_U_sv48_tag01.S
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,13 @@ vm_en:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -181,12 +182,13 @@ vm_en_with_pointer_masking:
nop
sd x9, 0(x8) // test the store access
nop
# lbu x9, 0(x8) // test the load access
# nop
# lhu x9, 0(x8) // test the load access
# nop
# lwu x9, 0(x8)
nop# -------------------- Disable Virtualization ---------------------------------
lbu x9, 0(x8) // test the load access
nop
lhu x9, 0(x8) // test the load access
nop
lwu x9, 0(x8)
nop
# -------------------- Disable Virtualization ---------------------------------

RVTEST_GOTO_MMODE // Switch back to Machine mode

Expand Down Expand Up @@ -239,7 +241,7 @@ signature_x13_1:
// trap signatures initialization
#ifdef rvtest_mtrap_routine
mtrap_sigptr:
.fill 64*(XLEN/64),4,0xdeadbeef
.fill 256*(XLEN/64),4,0xdeadbeef
#endif

sig_end_canary:
Expand Down
Loading

0 comments on commit 375c422

Please sign in to comment.