Skip to content

Commit

Permalink
Change: Add define for syscall
Browse files Browse the repository at this point in the history
  • Loading branch information
@dpretet
dpretet committed Nov 15, 2023
1 parent bf8ff69 commit f457a01
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 133 deletions.
5 changes: 5 additions & 0 deletions test/priv_sec_testsuite/tests/env/pmp_service.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@

#include "pmp.S"

.equ SVC_ERASE, 0
.equ SVC_CHECK, 1
.equ SVC_SETUP, 8
.equ SVC_INTP, 9

////////////////////////////////////////////
// Erase all PMP configurations
////////////////////////////////////////////
Expand Down
54 changes: 27 additions & 27 deletions test/priv_sec_testsuite/tests/rv32ui-p-test1.v
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@00010000
6F 00 00 0A 73 2F 20 34 93 0E 80 00 63 06 DF 1D
93 0E 90 00 63 0E DF 1B 93 0E B0 00 63 00 DF 25
93 0E 20 00 63 0E DF 23 B7 0E 00 80 93 8E BE 00
63 02 DF 25 B7 0E 00 80 93 8E 3E 00 63 0C DF 23
B7 0E 00 80 93 8E 7E 00 63 06 DF 23 93 0E 50 00
93 0E 90 00 63 0E DF 1B 93 0E B0 00 63 02 DF 25
93 0E 20 00 63 00 DF 25 B7 0E 00 80 93 8E BE 00
63 04 DF 25 B7 0E 00 80 93 8E 3E 00 63 0E DF 23
B7 0E 00 80 93 8E 7E 00 63 08 DF 23 93 0E 50 00
63 00 DF 19 93 0E 70 00 63 0C DF 17 93 0E 10 00
63 08 DF 17 93 0E 40 00 63 04 DF 17 93 0E 60 00
63 00 DF 17 93 0E 00 00 63 0C DF 15 13 0F 00 00
Expand All @@ -27,29 +27,29 @@ B7 02 00 80 93 82 F2 FF 73 90 02 3B 93 02 F0 01
93 08 D0 05 13 05 00 00 73 00 10 00 93 02 00 00
63 8A 02 00 73 90 52 10 B7 B2 00 00 93 82 92 10
73 90 22 30 73 50 00 30 97 02 00 00 93 82 42 01
73 90 12 34 73 25 40 F1 73 00 20 30 6F 00 00 0B
93 8F 1F 00 73 00 10 00 93 0E 70 00 63 8C 1E 05
93 0E 80 00 63 8C 1E 03 93 0E 90 00 63 90 D8 07
37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01
73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30
B3 EE EE 01 73 90 4E 30 6F 00 40 03 37 0F 00 00
13 0F FF F7 F3 2E 00 30 B3 FE EE 01 73 90 0E 30
6F 00 C0 01 37 FF FF FF 13 0F FF 7F F3 2E 40 30
B3 FE EE 01 73 90 4E 30 6F 00 40 00 F3 2E 10 34
93 8E 4E 00 73 90 1E 34 73 00 20 30 73 00 10 00
13 0A 1A 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34
73 00 20 30 13 0A 1A 00 73 00 20 30 93 08 90 00
73 00 00 00 93 02 00 00 13 03 00 00 93 03 40 06
93 82 12 00 23 20 50 00 03 23 00 00 E3 9A 72 FE
63 92 62 04 13 0A 00 00 13 03 10 00 73 00 50 10
63 1A 6A 02 93 08 80 00 73 00 00 00 73 00 50 10
93 08 70 00 73 00 00 00 13 00 00 00 73 00 50 10
13 00 00 00 73 00 50 10 13 00 00 00 6F 00 C0 02
63 14 30 02 0F 00 F0 0F 63 80 01 00 93 91 11 00
93 E1 11 00 93 08 D0 05 13 85 01 00 93 8F 1F 00
73 00 10 00 73 00 10 00 0F 00 F0 0F 93 01 10 00
93 08 D0 05 13 05 00 00 73 00 10 00 73 00 10 00
73 10 00 C0 00 00 00 00 00 00 00 00 00 00 00 00
73 90 12 34 73 25 40 F1 73 00 20 30 6F 00 40 0B
93 8F 1F 00 73 00 10 00 93 0E 70 00 63 8E 1E 05
93 0E 80 00 63 8E 1E 03 93 0E 90 00 63 84 D8 01
6F 00 00 06 37 0F 00 00 13 0F 0F 08 F3 2E 00 30
B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80
F3 2E 40 30 B3 EE EE 01 73 90 4E 30 6F 00 40 03
37 0F 00 00 13 0F FF F7 F3 2E 00 30 B3 FE EE 01
73 90 0E 30 6F 00 C0 01 37 FF FF FF 13 0F FF 7F
F3 2E 40 30 B3 FE EE 01 73 90 4E 30 6F 00 40 00
F3 2E 10 34 93 8E 4E 00 73 90 1E 34 73 00 20 30
73 00 10 00 13 0A 1A 00 F3 2E 10 34 93 8E 4E 00
73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30
93 08 90 00 73 00 00 00 93 02 00 00 13 03 00 00
93 03 40 06 93 82 12 00 23 20 50 00 03 23 00 00
E3 9A 72 FE 63 92 62 04 13 0A 00 00 13 03 10 00
73 00 50 10 63 1A 6A 02 93 08 80 00 73 00 00 00
73 00 50 10 93 08 70 00 73 00 00 00 13 00 00 00
73 00 50 10 13 00 00 00 73 00 50 10 13 00 00 00
6F 00 C0 02 63 14 30 02 0F 00 F0 0F 63 80 01 00
93 91 11 00 93 E1 11 00 93 08 D0 05 13 85 01 00
93 8F 1F 00 73 00 10 00 73 00 10 00 0F 00 F0 0F
93 01 10 00 93 08 D0 05 13 05 00 00 73 00 10 00
73 00 10 00 73 10 00 C0 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00
@00011000
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Expand Down
62 changes: 31 additions & 31 deletions test/priv_sec_testsuite/tests/rv32ui-v-test1.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ E3 9C 07 FD 73 90 08 10 93 97 26 00 B3 06 F6 00
63 94 E5 04 93 96 26 00 B3 06 D6 00 23 A0 F6 00
73 00 05 12 83 20 C1 00 13 01 01 01 67 80 00 00
93 E7 07 04 6F F0 1F FE 97 47 00 00 23 A4 07 AC
6F F0 1F F0 17 05 00 00 13 05 45 5D EF F0 5F D0
13 05 30 00 EF F0 5F D6 17 05 00 00 13 05 45 60
6F F0 1F F0 17 05 00 00 13 05 85 5D EF F0 5F D0
13 05 30 00 EF F0 5F D6 17 05 00 00 13 05 85 60
EF F0 1F CF 13 05 30 00 EF F0 1F D5 17 05 00 00
13 05 85 63 EF F0 DF CD 13 05 30 00 EF F0 DF D3
17 05 00 00 13 05 C5 63 EF F0 9F CC 13 05 30 00
13 05 C5 63 EF F0 DF CD 13 05 30 00 EF F0 DF D3
17 05 00 00 13 05 05 64 EF F0 9F CC 13 05 30 00
EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04
23 26 11 04 23 22 91 04 23 20 21 05 23 2E 31 03
23 2C 41 03 23 2A 51 03 23 28 61 03 23 26 71 03
Expand All @@ -139,14 +139,14 @@ EF F0 9F D2 83 25 C5 08 13 01 01 FB 23 24 81 04
03 2D 01 02 83 2D C1 01 13 01 01 05 6F D0 1F A8
03 27 45 08 93 77 37 00 63 98 07 08 EF 07 80 00
73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 06
13 05 10 04 97 05 00 00 93 85 45 59 97 F6 FF FF
13 05 10 04 97 05 00 00 93 85 85 59 97 F6 FF FF
93 86 46 99 17 F6 FF FF 13 06 C6 9C 03 A7 06 00
83 A7 46 00 13 08 05 00 93 85 15 00 33 67 F7 00
B7 08 01 01 63 02 07 02 13 07 00 00 23 20 E6 00
93 07 00 00 23 22 F6 00 03 A7 06 00 83 A7 46 00
33 67 F7 00 E3 12 07 FE 03 C5 05 00 23 A0 06 01
23 A2 16 01 E3 1C 05 FA 13 05 30 00 EF F0 DF BE
13 05 10 00 EF F0 5F BE 17 05 00 00 13 05 45 5B
13 05 10 00 EF F0 5F BE 17 05 00 00 13 05 85 5B
EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02
37 1C 00 00 97 14 00 00 93 84 C4 90 97 2B 00 00
93 8B 4B 90 37 0B 04 00 B7 0A C0 FF 97 4D 00 00
Expand All @@ -160,10 +160,10 @@ EF F0 1F B7 13 05 30 00 EF F0 1F BD 03 29 85 02
93 FC 0C 08 83 25 C1 00 63 80 0C 04 37 16 00 00
13 05 0C 00 EF F0 DF 86 B3 87 84 00 73 10 0D 10
03 A7 0D 00 23 A0 07 00 E3 1E 07 F6 23 A0 FD 00
23 20 FA 00 6F F0 9F F7 17 05 00 00 13 05 85 4F
EF F0 1F A9 6F F0 5F F0 17 05 00 00 13 05 05 49
23 20 FA 00 6F F0 9F F7 17 05 00 00 13 05 C5 4F
EF F0 1F A9 6F F0 5F F0 17 05 00 00 13 05 45 49
EF F0 1F A8 13 05 30 00 EF F0 1F AE 17 05 00 00
13 05 85 44 EF F0 DF A6 13 05 30 00 EF F0 DF AC
13 05 C5 44 EF F0 DF A6 13 05 30 00 EF F0 DF AC
13 05 09 00 EF F0 5F AC F3 27 40 F1 63 96 07 16
17 36 00 00 13 06 06 80 93 57 C6 00 13 01 01 F6
93 97 A7 00 23 2E 11 08 23 2C 81 08 97 15 00 00
Expand Down Expand Up @@ -193,29 +193,29 @@ EF F0 CF F1 B7 07 00 80 33 04 F4 00 13 05 01 00
93 D6 17 00 B3 E6 D5 00 B3 C7 D7 00 93 97 E7 01
B3 75 F5 00 13 57 17 00 93 87 06 00 33 E7 E5 00
B3 F6 C7 00 93 F5 17 00 B3 86 06 01 E3 96 05 FC
03 A0 06 00 6F F0 9F FC 17 05 00 00 13 05 45 31
03 A0 06 00 6F F0 9F FC 17 05 00 00 13 05 85 31
EF F0 1F 88 13 05 30 00 EF F0 1F 8E 67 80 00 00
6F 00 00 0B 93 8F 1F 00 73 00 10 00 93 0E 70 00
63 8C 1E 05 93 0E 80 00 63 8C 1E 03 93 0E 90 00
63 90 D8 07 37 0F 00 00 13 0F 0F 08 F3 2E 00 30
B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80
F3 2E 40 30 B3 EE EE 01 73 90 4E 30 6F 00 40 03
37 0F 00 00 13 0F FF F7 F3 2E 00 30 B3 FE EE 01
73 90 0E 30 6F 00 C0 01 37 FF FF FF 13 0F FF 7F
F3 2E 40 30 B3 FE EE 01 73 90 4E 30 6F 00 40 00
F3 2E 10 34 93 8E 4E 00 73 90 1E 34 73 00 20 30
73 00 10 00 13 0A 1A 00 F3 2E 10 34 93 8E 4E 00
73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30
93 08 90 00 73 00 00 00 93 02 00 00 13 03 00 00
93 03 40 06 93 82 12 00 23 20 50 00 03 23 00 00
E3 9A 72 FE 63 92 62 04 13 0A 00 00 13 03 10 00
73 00 50 10 63 1A 6A 02 93 08 80 00 73 00 00 00
73 00 50 10 93 08 70 00 73 00 00 00 13 00 00 00
73 00 50 10 13 00 00 00 73 00 50 10 13 00 00 00
6F 00 80 01 63 1A 30 00 13 95 11 00 63 00 05 00
13 65 15 00 73 00 00 00 13 05 10 00 73 00 00 00
73 00 10 00 73 10 00 C0
@80002B18
6F 00 40 0B 93 8F 1F 00 73 00 10 00 93 0E 70 00
63 8E 1E 05 93 0E 80 00 63 8E 1E 03 93 0E 90 00
63 84 D8 01 6F 00 00 06 37 0F 00 00 13 0F 0F 08
F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00
13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 73 90 4E 30
6F 00 40 03 37 0F 00 00 13 0F FF F7 F3 2E 00 30
B3 FE EE 01 73 90 0E 30 6F 00 C0 01 37 FF FF FF
13 0F FF 7F F3 2E 40 30 B3 FE EE 01 73 90 4E 30
6F 00 40 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34
73 00 20 30 73 00 10 00 13 0A 1A 00 F3 2E 10 34
93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00
73 00 20 30 93 08 90 00 73 00 00 00 93 02 00 00
13 03 00 00 93 03 40 06 93 82 12 00 23 20 50 00
03 23 00 00 E3 9A 72 FE 63 92 62 04 13 0A 00 00
13 03 10 00 73 00 50 10 63 1A 6A 02 93 08 80 00
73 00 00 00 73 00 50 10 93 08 70 00 73 00 00 00
13 00 00 00 73 00 50 10 13 00 00 00 73 00 50 10
13 00 00 00 6F 00 80 01 63 1A 30 00 13 95 11 00
63 00 05 00 13 65 15 00 73 00 00 00 13 05 10 00
73 00 00 00 73 00 10 00 73 10 00 C0
@80002B1C
41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64
3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C
3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20
Expand Down
52 changes: 26 additions & 26 deletions test/priv_sec_testsuite/tests/rv64ui-p-test1.v
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@00010000
6F 00 00 0A 73 2F 20 34 93 0E 80 00 63 08 DF 1D
93 0E 90 00 63 00 DF 1D 93 0E B0 00 63 02 DF 25
93 0E 20 00 63 00 DF 25 B7 0E 00 80 93 8E BE 00
63 04 DF 25 B7 0E 00 80 93 8E 3E 00 63 0E DF 23
B7 0E 00 80 93 8E 7E 00 63 08 DF 23 93 0E 50 00
93 0E 90 00 63 00 DF 1D 93 0E B0 00 63 04 DF 25
93 0E 20 00 63 02 DF 25 B7 0E 00 80 93 8E BE 00
63 06 DF 25 B7 0E 00 80 93 8E 3E 00 63 00 DF 25
B7 0E 00 80 93 8E 7E 00 63 0A DF 23 93 0E 50 00
63 02 DF 19 93 0E 70 00 63 0E DF 17 93 0E 10 00
63 0A DF 17 93 0E 40 00 63 06 DF 17 93 0E 60 00
63 02 DF 17 93 0E 00 00 63 0E DF 15 13 0F 00 00
Expand All @@ -28,28 +28,28 @@ B7 0E 00 80 93 8E 7E 00 63 08 DF 23 93 0E 50 00
93 02 00 00 63 8A 02 00 73 90 52 10 B7 B2 00 00
9B 82 92 10 73 90 22 30 73 50 00 30 97 02 00 00
93 82 42 01 73 90 12 34 73 25 40 F1 73 00 20 30
6F 00 00 0B 93 8F 1F 00 73 00 10 00 93 0E 70 00
63 8C 1E 05 93 0E 80 00 63 8C 1E 03 93 0E 90 00
63 90 D8 07 37 0F 00 00 13 0F 0F 08 F3 2E 00 30
B3 EE EE 01 73 90 0E 30 37 1F 00 00 13 0F 0F 80
F3 2E 40 30 B3 EE EE 01 73 90 4E 30 6F 00 40 03
37 0F 00 00 13 0F FF F7 F3 2E 00 30 B3 FE EE 01
73 90 0E 30 6F 00 C0 01 37 FF FF FF 13 0F FF 7F
F3 2E 40 30 B3 FE EE 01 73 90 4E 30 6F 00 40 00
F3 2E 10 34 93 8E 4E 00 73 90 1E 34 73 00 20 30
73 00 10 00 13 0A 1A 00 F3 2E 10 34 93 8E 4E 00
73 90 1E 34 73 00 20 30 13 0A 1A 00 73 00 20 30
93 08 90 00 73 00 00 00 93 02 00 00 13 03 00 00
93 03 40 06 93 82 12 00 23 20 50 00 03 23 00 00
E3 9A 72 FE 63 92 62 04 13 0A 00 00 13 03 10 00
73 00 50 10 63 1A 6A 02 93 08 80 00 73 00 00 00
73 00 50 10 93 08 70 00 73 00 00 00 13 00 00 00
73 00 50 10 13 00 00 00 73 00 50 10 13 00 00 00
6F 00 C0 02 63 14 30 02 0F 00 F0 0F 63 80 01 00
93 91 11 00 93 E1 11 00 93 08 D0 05 13 85 01 00
93 8F 1F 00 73 00 10 00 73 00 10 00 0F 00 F0 0F
93 01 10 00 93 08 D0 05 13 05 00 00 73 00 10 00
73 00 10 00 73 10 00 C0 00 00 00 00 00 00 00 00
6F 00 40 0B 93 8F 1F 00 73 00 10 00 93 0E 70 00
63 8E 1E 05 93 0E 80 00 63 8E 1E 03 93 0E 90 00
63 84 D8 01 6F 00 00 06 37 0F 00 00 13 0F 0F 08
F3 2E 00 30 B3 EE EE 01 73 90 0E 30 37 1F 00 00
13 0F 0F 80 F3 2E 40 30 B3 EE EE 01 73 90 4E 30
6F 00 40 03 37 0F 00 00 13 0F FF F7 F3 2E 00 30
B3 FE EE 01 73 90 0E 30 6F 00 C0 01 37 FF FF FF
13 0F FF 7F F3 2E 40 30 B3 FE EE 01 73 90 4E 30
6F 00 40 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34
73 00 20 30 73 00 10 00 13 0A 1A 00 F3 2E 10 34
93 8E 4E 00 73 90 1E 34 73 00 20 30 13 0A 1A 00
73 00 20 30 93 08 90 00 73 00 00 00 93 02 00 00
13 03 00 00 93 03 40 06 93 82 12 00 23 20 50 00
03 23 00 00 E3 9A 72 FE 63 92 62 04 13 0A 00 00
13 03 10 00 73 00 50 10 63 1A 6A 02 93 08 80 00
73 00 00 00 73 00 50 10 93 08 70 00 73 00 00 00
13 00 00 00 73 00 50 10 13 00 00 00 73 00 50 10
13 00 00 00 6F 00 C0 02 63 14 30 02 0F 00 F0 0F
63 80 01 00 93 91 11 00 93 E1 11 00 93 08 D0 05
13 85 01 00 93 8F 1F 00 73 00 10 00 73 00 10 00
0F 00 F0 0F 93 01 10 00 93 08 D0 05 13 05 00 00
73 00 10 00 73 00 10 00 73 10 00 C0 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00
@00011000
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Expand Down
63 changes: 32 additions & 31 deletions test/priv_sec_testsuite/tests/rv64ui-v-test1.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ E3 9C 07 FD 73 90 08 10 93 97 36 00 B3 06 F6 00
63 94 E5 04 93 96 36 00 B3 06 D6 00 23 B0 F6 00
73 00 05 12 83 30 81 00 13 01 01 01 67 80 00 00
93 E7 07 04 6F F0 1F FE 97 67 00 00 23 BC 07 B2
6F F0 1F F0 17 05 00 00 13 05 C5 5C EF F0 1F D8
13 05 30 00 EF F0 1F DC 17 05 00 00 13 05 05 60
6F F0 1F F0 17 05 00 00 13 05 45 5D EF F0 1F D8
13 05 30 00 EF F0 1F DC 17 05 00 00 13 05 85 60
EF F0 DF D6 13 05 30 00 EF F0 DF DA 17 05 00 00
13 05 45 63 EF F0 9F D5 13 05 30 00 EF F0 9F D9
17 05 00 00 13 05 85 63 EF F0 5F D4 13 05 30 00
13 05 C5 63 EF F0 9F D5 13 05 30 00 EF F0 9F D9
17 05 00 00 13 05 05 64 EF F0 5F D4 13 05 30 00
EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06
23 3C 11 06 23 34 91 06 23 30 21 07 23 3C 31 05
23 38 41 05 23 34 51 05 23 30 61 05 23 3C 71 03
Expand All @@ -132,12 +132,12 @@ EF F0 5F D8 83 35 85 11 13 01 01 F8 23 38 81 06
03 3D 01 02 83 3D 81 01 13 01 01 08 6F D0 1F AF
03 37 85 10 93 77 37 00 63 98 07 06 EF 07 80 00
73 10 30 00 03 27 07 00 83 A7 07 00 63 0A F7 04
13 05 10 10 93 07 10 04 97 06 00 00 93 86 06 59
13 05 10 10 93 07 10 04 97 06 00 00 93 86 86 59
17 F7 FF FF 13 07 07 A0 13 15 05 03 83 35 07 00
93 86 16 00 33 E6 A7 00 63 8A 05 00 97 F7 FF FF
23 B2 07 A2 83 37 07 00 E3 9A 07 FE 83 C7 06 00
23 30 C7 00 E3 9C 07 FC 13 05 30 00 EF F0 9F C6
13 05 10 00 EF F0 1F C6 17 05 00 00 13 05 05 5E
13 05 10 00 EF F0 1F C6 17 05 00 00 13 05 85 5E
EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05
37 1C 00 00 97 14 00 00 93 84 C4 99 97 2B 00 00
93 8B 4B 99 37 0B 04 00 B7 0A E0 FF 97 6D 00 00
Expand All @@ -151,10 +151,10 @@ EF F0 DF C0 13 05 30 00 EF F0 DF C4 03 29 05 05
93 FC 0C 08 83 35 81 00 63 80 0C 04 37 16 00 00
13 05 0C 00 EF F0 DF 8F B3 87 84 00 73 10 0D 10
03 B7 0D 00 23 B0 07 00 E3 1E 07 F6 23 B0 FD 00
23 30 FA 00 6F F0 9F F7 17 05 00 00 13 05 85 52
EF F0 DF B2 6F F0 5F F0 17 05 00 00 13 05 85 4B
23 30 FA 00 6F F0 9F F7 17 05 00 00 13 05 05 53
EF F0 DF B2 6F F0 5F F0 17 05 00 00 13 05 05 4C
EF F0 DF B1 13 05 30 00 EF F0 DF B5 17 05 00 00
13 05 C5 46 EF F0 9F B0 13 05 30 00 EF F0 9F B4
13 05 45 47 EF F0 9F B0 13 05 30 00 EF F0 9F B4
13 05 09 00 EF F0 1F B4 F3 27 40 F1 63 9A 07 18
97 47 00 00 93 87 07 89 13 01 01 ED 93 D7 C7 00
23 30 81 12 17 58 00 00 13 08 C8 87 13 04 05 00
Expand Down Expand Up @@ -186,28 +186,29 @@ E3 1A E3 FC 13 06 00 12 93 05 00 00 13 05 01 00
2F 20 07 00 13 D7 17 00 B3 C7 E7 00 93 97 E7 03
B3 F7 D7 00 B3 E7 E7 00 33 F7 C7 00 93 F5 17 00
33 07 A7 00 E3 9E 05 FC 03 20 07 00 6F F0 9F FD
17 05 00 00 13 05 05 33 EF F0 5F 90 13 05 30 00
EF F0 5F 94 67 80 00 00 6F 00 00 0B 93 8F 1F 00
73 00 10 00 93 0E 70 00 63 8C 1E 05 93 0E 80 00
63 8C 1E 03 93 0E 90 00 63 90 D8 07 37 0F 00 00
13 0F 0F 08 F3 2E 00 30 B3 EE EE 01 73 90 0E 30
37 1F 00 00 13 0F 0F 80 F3 2E 40 30 B3 EE EE 01
73 90 4E 30 6F 00 40 03 37 0F 00 00 13 0F FF F7
F3 2E 00 30 B3 FE EE 01 73 90 0E 30 6F 00 C0 01
37 FF FF FF 13 0F FF 7F F3 2E 40 30 B3 FE EE 01
73 90 4E 30 6F 00 40 00 F3 2E 10 34 93 8E 4E 00
73 90 1E 34 73 00 20 30 73 00 10 00 13 0A 1A 00
F3 2E 10 34 93 8E 4E 00 73 90 1E 34 73 00 20 30
13 0A 1A 00 73 00 20 30 93 08 90 00 73 00 00 00
93 02 00 00 13 03 00 00 93 03 40 06 93 82 12 00
23 20 50 00 03 23 00 00 E3 9A 72 FE 63 92 62 04
13 0A 00 00 13 03 10 00 73 00 50 10 63 1A 6A 02
93 08 80 00 73 00 00 00 73 00 50 10 93 08 70 00
73 00 00 00 13 00 00 00 73 00 50 10 13 00 00 00
73 00 50 10 13 00 00 00 6F 00 80 01 63 1A 30 00
13 95 11 00 63 00 05 00 13 65 15 00 73 00 00 00
13 05 10 00 73 00 00 00 73 00 10 00 73 10 00 C0
@80002AA0
17 05 00 00 13 05 85 33 EF F0 5F 90 13 05 30 00
EF F0 5F 94 67 80 00 00 6F 00 40 0B 93 8F 1F 00
73 00 10 00 93 0E 70 00 63 8E 1E 05 93 0E 80 00
63 8E 1E 03 93 0E 90 00 63 84 D8 01 6F 00 00 06
37 0F 00 00 13 0F 0F 08 F3 2E 00 30 B3 EE EE 01
73 90 0E 30 37 1F 00 00 13 0F 0F 80 F3 2E 40 30
B3 EE EE 01 73 90 4E 30 6F 00 40 03 37 0F 00 00
13 0F FF F7 F3 2E 00 30 B3 FE EE 01 73 90 0E 30
6F 00 C0 01 37 FF FF FF 13 0F FF 7F F3 2E 40 30
B3 FE EE 01 73 90 4E 30 6F 00 40 00 F3 2E 10 34
93 8E 4E 00 73 90 1E 34 73 00 20 30 73 00 10 00
13 0A 1A 00 F3 2E 10 34 93 8E 4E 00 73 90 1E 34
73 00 20 30 13 0A 1A 00 73 00 20 30 93 08 90 00
73 00 00 00 93 02 00 00 13 03 00 00 93 03 40 06
93 82 12 00 23 20 50 00 03 23 00 00 E3 9A 72 FE
63 92 62 04 13 0A 00 00 13 03 10 00 73 00 50 10
63 1A 6A 02 93 08 80 00 73 00 00 00 73 00 50 10
93 08 70 00 73 00 00 00 13 00 00 00 73 00 50 10
13 00 00 00 73 00 50 10 13 00 00 00 6F 00 80 01
63 1A 30 00 13 95 11 00 63 00 05 00 13 65 15 00
73 00 00 00 13 05 10 00 73 00 00 00 73 00 10 00
73 10 00 C0
@80002AA8
41 73 73 65 72 74 69 6F 6E 20 66 61 69 6C 65 64
3A 20 61 64 64 72 20 3E 3D 20 28 31 55 4C 20 3C
3C 20 31 32 29 20 26 26 20 61 64 64 72 20 3C 20
Expand Down
19 changes: 12 additions & 7 deletions test/priv_sec_testsuite/tests/rv64ui/test1.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
.equ MEIE_ON, 0x00000800
.equ MEIE_OFF, 0xFFFFF7FF

.equ SVC_DIS_EIRQ, 7
.equ SVC_DIS_INTP, 8
.equ SVC_EN_INTP, 9

RVTEST_RV64U
RVTEST_CODE_BEGIN

Expand All @@ -37,12 +41,13 @@ ECALL_SUPERVISOR_MODE:
ebreak

ECALL_USER_MODE:
li t4, 7
li t4, SVC_DIS_EIRQ
beq t4, a7, DISABLE_EIRQ
li t4, 8
li t4, SVC_DIS_INTP
beq t4, a7, DISABLE_INTP
li t4, 9
bne a7, t4, RET_ECALL
li t4, SVC_EN_INTP
beq a7, t4, ENABLE_INTP
j RET_ECALL

ENABLE_INTP:
# Enable IRQ
Expand Down Expand Up @@ -100,7 +105,7 @@ INTP:

TEST:
# Enable interrupts thru a syscall
li a7, 9
li a7, SVC_EN_INTP
ecall

// Loop to wait for a interrupt
Expand All @@ -124,13 +129,13 @@ TEST2:

// Use WFI to wait for the interrupt with EIRQ disabled
TEST3:
li a7, 8
li a7, SVC_DIS_INTP
ecall
wfi

// Use WFI without interrupt enabled, must be a NOP
TEST4:
li a7, 7
li a7, SVC_DIS_EIRQ
ecall
nop
wfi
Expand Down
Loading

0 comments on commit f457a01

Please sign in to comment.