Skip to content

Slight output format changes for **herd7** and **litmus7** #1992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maranget wants to merge 2 commits into
base: master
Choose a base branch
from
+124 −104
Open

Slight output format changes for **herd7** and **litmus7** #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
517ec95
[herd] Get rid of spurious space in output
maranget Sep 4, 2026
317fda2
[litmus] Slight change of output format
maranget Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gen/tests/AArch64.MTE/LB+dmb.sy+amo.ldaddal-polt.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Test LB+dmb.sy+amo.ldaddal-polt Allowed
States 6
0:X1=0; 1:X1=0; [y]=1; ~Fault(P0);
0:X1=0; 1:X1=0; [y]=1; ~Fault(P0);
0:X1=0; 1:X1=0; [y]=1; Fault(P0,TagCheck);
0:X1=0; 1:X1=1; [y]=1; ~Fault(P0);
0:X1=0; 1:X1=1; [y]=1; ~Fault(P0);
0:X1=0; 1:X1=1; [y]=1; Fault(P0,TagCheck);
0:X1=0; 1:X1=1; [y]=3; ~Fault(P0);
0:X1=0; 1:X1=1; [y]=3; ~Fault(P0);
0:X1=0; 1:X1=1; [y]=3; Fault(P0,TagCheck);
Ok
Witnesses
Expand Down
4 changes: 2 additions & 2 deletions gen/tests/AArch64.MTE/LB+dmb.sypt+amo.ldaddal-polp.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Test LB+dmb.sypt+amo.ldaddal-polp Allowed
States 4
0:X1=0; 1:X1=0; [y]=1; ~Fault(P1);
0:X1=0; 1:X1=0; [y]=1; ~Fault(P1);
0:X1=0; 1:X1=0; [y]=1; Fault(P1,TagCheck);
0:X1=1; 1:X1=0; [y]=1; ~Fault(P1);
0:X1=1; 1:X1=0; [y]=1; ~Fault(P1);
0:X1=1; 1:X1=0; [y]=1; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion gen/tests/AArch64.MTE/LB+dmb.sypt+amo.ldaddal-polt.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test LB+dmb.sypt+amo.ldaddal-polt Allowed
States 4
0:X1=0; 1:X1=0; [y]=1; ~Fault(P1); ~Fault(P0);
0:X1=0; 1:X1=0; [y]=1; ~Fault(P1); ~Fault(P0);
0:X1=0; 1:X1=0; [y]=1; Fault(P0,TagCheck); ~Fault(P1);
0:X1=0; 1:X1=0; [y]=1; Fault(P0,TagCheck); Fault(P1,TagCheck);
0:X1=0; 1:X1=0; [y]=1; Fault(P1,TagCheck); ~Fault(P0);
Expand Down
2 changes: 1 addition & 1 deletion gen/tests/AArch64.MTE/LB+dmb.sytt+amo.ldaddal-polp.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test LB+dmb.sytt+amo.ldaddal-polp Allowed
States 2
0:X0=x:green; 1:X0=0; [y]=1; ~Fault(P1);
0:X0=x:green; 1:X0=0; [y]=1; ~Fault(P1);
0:X0=x:green; 1:X0=0; [y]=1; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
4 changes: 2 additions & 2 deletions gen/tests/AArch64.MTE/LB+dmb.sytt+amo.ldaddal-polt.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Test LB+dmb.sytt+amo.ldaddal-polt Allowed
States 4
0:X0=x:green; 1:X0=0; [y]=1; ~Fault(P1);
0:X0=x:green; 1:X0=0; [y]=1; ~Fault(P1);
0:X0=x:green; 1:X0=0; [y]=1; Fault(P1,TagCheck);
0:X0=x:red; 1:X0=0; [y]=1; ~Fault(P1);
0:X0=x:red; 1:X0=0; [y]=1; ~Fault(P1);
0:X0=x:red; 1:X0=0; [y]=1; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
4 changes: 2 additions & 2 deletions gen/tests/AArch64.MTE/MP+dmb.sypt+amo.ldaddal-polp.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Test MP+dmb.sypt+amo.ldaddal-polp Allowed
States 4
1:X0=0; 1:X5=0; [y]=1; ~Fault(P1);
1:X0=0; 1:X5=0; [y]=1; ~Fault(P1);
1:X0=0; 1:X5=0; [y]=1; Fault(P1,TagCheck);
1:X0=0; 1:X5=1; [y]=1; ~Fault(P1);
1:X0=0; 1:X5=1; [y]=1; ~Fault(P1);
1:X0=0; 1:X5=1; [y]=1; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion gen/tests/AArch64.MTE/MP+dmb.sypt+amo.ldaddal-polt.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test MP+dmb.sypt+amo.ldaddal-polt Allowed
States 2
1:X0=0; 1:X5=x:green; [y]=1; ~Fault(P1);
1:X0=0; 1:X5=x:green; [y]=1; ~Fault(P1);
1:X0=0; 1:X5=x:green; [y]=1; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
6 changes: 3 additions & 3 deletions gen/tests/AArch64.MTE/MP+dmb.sytp+amo.ldaddal-polp.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Test MP+dmb.sytp+amo.ldaddal-polp Allowed
States 6
1:X2=0; 1:X5=0; [y]=1; ~Fault(P1);
1:X2=0; 1:X5=0; [y]=1; ~Fault(P1);
1:X2=0; 1:X5=0; [y]=1; Fault(P1,TagCheck);
1:X2=1; 1:X5=0; [y]=1; ~Fault(P1);
1:X2=1; 1:X5=0; [y]=1; ~Fault(P1);
1:X2=1; 1:X5=0; [y]=1; Fault(P1,TagCheck);
1:X2=1; 1:X5=0; [y]=3; ~Fault(P1);
1:X2=1; 1:X5=0; [y]=3; ~Fault(P1);
1:X2=1; 1:X5=0; [y]=3; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion gen/tests/AArch64.MTE/MP+dmb.sytt+amo.ldaddal-polp.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test MP+dmb.sytt+amo.ldaddal-polp Allowed
States 2
1:X4=0; 1:X6=0; [y]=1; ~Fault(P1);
1:X4=0; 1:X6=0; [y]=1; ~Fault(P1);
1:X4=0; 1:X6=0; [y]=1; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
4 changes: 2 additions & 2 deletions gen/tests/AArch64.MTE/MP+dmb.sytt+amo.ldaddal-polt.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Test MP+dmb.sytt+amo.ldaddal-polt Allowed
States 4
1:X4=0; 1:X6=x:green; [y]=1; ~Fault(P1);
1:X4=0; 1:X6=x:green; [y]=1; ~Fault(P1);
1:X4=0; 1:X6=x:green; [y]=1; Fault(P1,TagCheck);
1:X4=0; 1:X6=x:red; [y]=1; ~Fault(P1);
1:X4=0; 1:X6=x:red; [y]=1; ~Fault(P1);
1:X4=0; 1:X6=x:red; [y]=1; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
6 changes: 3 additions & 3 deletions gen/tests/AArch64.MTE/S+dmb.sy+amo.ldaddal-polt.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Test S+dmb.sy+amo.ldaddal-polt Allowed
States 6
1:X0=0; [x]=1; [y]=1; ~Fault(P0);
1:X0=0; [x]=1; [y]=1; ~Fault(P0);
1:X0=0; [x]=1; [y]=1; Fault(P0,TagCheck);
1:X0=1; [x]=1; [y]=1; ~Fault(P0);
1:X0=1; [x]=1; [y]=1; ~Fault(P0);
1:X0=1; [x]=1; [y]=1; Fault(P0,TagCheck);
1:X0=1; [x]=1; [y]=3; ~Fault(P0);
1:X0=1; [x]=1; [y]=3; ~Fault(P0);
1:X0=1; [x]=1; [y]=3; Fault(P0,TagCheck);
Ok
Witnesses
Expand Down
4 changes: 2 additions & 2 deletions gen/tests/AArch64.MTE/S+dmb.sypt+amo.ldaddal-polp.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Test S+dmb.sypt+amo.ldaddal-polp Allowed
States 4
1:X0=0; [x]=1; [y]=1; ~Fault(P1);
1:X0=0; [x]=1; [y]=1; ~Fault(P1);
1:X0=0; [x]=1; [y]=1; Fault(P1,TagCheck);
1:X0=0; [x]=2; [y]=1; ~Fault(P1);
1:X0=0; [x]=2; [y]=1; ~Fault(P1);
1:X0=0; [x]=2; [y]=1; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion gen/tests/AArch64.MTE/S+dmb.sypt+amo.ldaddal-polt.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test S+dmb.sypt+amo.ldaddal-polt Allowed
States 4
1:X0=0; [x]=1; [y]=1; ~Fault(P1); ~Fault(P0);
1:X0=0; [x]=1; [y]=1; ~Fault(P1); ~Fault(P0);
1:X0=0; [x]=1; [y]=1; Fault(P0,TagCheck); ~Fault(P1);
1:X0=0; [x]=1; [y]=1; Fault(P0,TagCheck); Fault(P1,TagCheck);
1:X0=0; [x]=1; [y]=1; Fault(P1,TagCheck); ~Fault(P0);
Expand Down
6 changes: 3 additions & 3 deletions gen/tests/AArch64.MTE/S+dmb.sytp+amo.ldaddal-polp.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Test S+dmb.sytp+amo.ldaddal-polp Allowed
States 6
1:X2=0; [y]=1; [tag(x)]=:red; ~Fault(P1);
1:X2=0; [y]=1; [tag(x)]=:red; ~Fault(P1);
1:X2=0; [y]=1; [tag(x)]=:red; Fault(P1,TagCheck);
1:X2=1; [y]=1; [tag(x)]=:red; ~Fault(P1);
1:X2=1; [y]=1; [tag(x)]=:red; ~Fault(P1);
1:X2=1; [y]=1; [tag(x)]=:red; Fault(P1,TagCheck);
1:X2=1; [y]=3; [tag(x)]=:red; ~Fault(P1);
1:X2=1; [y]=3; [tag(x)]=:red; ~Fault(P1);
1:X2=1; [y]=3; [tag(x)]=:red; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion gen/tests/AArch64.MTE/S+dmb.sytt+amo.ldaddal-polp.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test S+dmb.sytt+amo.ldaddal-polp Allowed
States 2
1:X4=0; [y]=1; [tag(x)]=:red; ~Fault(P1);
1:X4=0; [y]=1; [tag(x)]=:red; ~Fault(P1);
1:X4=0; [y]=1; [tag(x)]=:red; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
4 changes: 2 additions & 2 deletions gen/tests/AArch64.MTE/S+dmb.sytt+amo.ldaddal-polt.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Test S+dmb.sytt+amo.ldaddal-polt Allowed
States 4
1:X4=0; [y]=1; [tag(x)]=:blue; ~Fault(P1);
1:X4=0; [y]=1; [tag(x)]=:blue; ~Fault(P1);
1:X4=0; [y]=1; [tag(x)]=:blue; Fault(P1,TagCheck);
1:X4=0; [y]=1; [tag(x)]=:red; ~Fault(P1);
1:X4=0; [y]=1; [tag(x)]=:red; ~Fault(P1);
1:X4=0; [y]=1; [tag(x)]=:red; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
5 changes: 3 additions & 2 deletions herd/archExtra_herd.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,8 +1034,9 @@ module Make(C:Config) (I:I) : S with module I = I
(fun f -> FaultAtomSet.exists
(fun f0 -> check_one_fatom f f0) fobs)
flts in
pp_st ^ " " ^
FaultSet.pp_str " " (fun f -> pp_fault (data_intr_to_any_flt f) ^ ";") flts ^
pp_st ^
FaultSet.pp_str ""
(fun f -> " " ^ pp_fault (data_intr_to_any_flt f) ^ ";") flts ^
String.concat "" noflts ^
pp_solver

Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.MTE/B002.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test B002 Required
States 1
0:X5=2; [x]=1; ~Fault(P0,x);
0:X5=2; [x]=1; ~Fault(P0,x);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.MTE/B010.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test B010 Required
States 1
~Fault(P0,x);
~Fault(P0,x);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.MTE/B012.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test B012 Required
States 1
~Fault(P0,x);
~Fault(P0,x);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
4 changes: 2 additions & 2 deletions herd/tests/instructions/AArch64.MTE/L01.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Test S+dmb.sytt+addrpt Allowed
States 4
1:X1=0; [tag(x)]=:blue; ~Fault(P1);
1:X1=0; [tag(x)]=:blue; ~Fault(P1);
1:X1=0; [tag(x)]=:blue; Fault(P1,TagCheck);
1:X1=0; [tag(x)]=:red; ~Fault(P1);
1:X1=0; [tag(x)]=:red; ~Fault(P1);
1:X1=0; [tag(x)]=:red; Fault(P1,TagCheck);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.MTE/S01.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test S01 Allowed
States 2
~Fault(P0,x);
~Fault(P0,x);
Fault(P0,x:red,TagCheck);
Ok
Witnesses
Expand Down
6 changes: 3 additions & 3 deletions herd/tests/instructions/AArch64.MTE/Y014.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test MP+dmb.st+irg.v2 Allowed
States 16
1:X0=0; 1:X2=0; ~Fault(P1);
1:X0=0; 1:X2=0; ~Fault(P1);
1:X0=0; 1:X2=0; Fault(P1,x:black,TagCheck);
1:X0=0; 1:X2=0; Fault(P1,x:blue,TagCheck);
1:X0=0; 1:X2=0; Fault(P1,x:cyan,TagCheck);
Expand All @@ -14,8 +14,8 @@ States 16
1:X0=0; 1:X2=2; Fault(P1,x:magenta,TagCheck);
1:X0=0; 1:X2=2; Fault(P1,x:white,TagCheck);
1:X0=0; 1:X2=2; Fault(P1,x:yellow,TagCheck);
1:X0=1; 1:X2=0; ~Fault(P1);
1:X0=1; 1:X2=2; ~Fault(P1);
1:X0=1; 1:X2=0; ~Fault(P1);
1:X0=1; 1:X2=2; ~Fault(P1);
No
Witnesses
Positive: 0 Negative: 16
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A01.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A01 Required
States 1
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A02.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A02 Required
States 1
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A03.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A03 Required
States 1
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A04.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A04 Required
States 1
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A05.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A05 Required
States 1
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A06.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A06 Required
States 1
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A07.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A07 Allowed
States 2
0:X1=42; ~Fault(P0,MMU:Translation); pacda(x,0x35)=x;
0:X1=42; ~Fault(P0,MMU:Translation); pacda(x,0x35)=x;
0:X1=53; Fault(P0,x,MMU:Translation);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A08.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A08 Allowed
States 2
0:X1=42; ~Fault(P0); pacda(x,0x35)=x;
0:X1=42; ~Fault(P0); pacda(x,0x35)=x;
0:X1=53; Fault(P0,x,D-MMU:Translation);
Ok
Witnesses
Expand Down
4 changes: 2 additions & 2 deletions herd/tests/instructions/AArch64.PAC/A09.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Test A09 Required
States 2
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0); pacda(x,0x35)=x;
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0); pacda(x,0x35)=x;
Ok
Witnesses
Positive: 2 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A10.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A10 Allowed
States 2
0:X1=42; ~Fault(P0,MMU:Translation); pacda(x,0x35)=x;
0:X1=42; ~Fault(P0,MMU:Translation); pacda(x,0x35)=x;
0:X1=53; Fault(P0,x,MMU:Translation);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A11.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A08 Allowed
States 2
0:X1=42; ~Fault(P0); pacda(x,0x35)=x;
0:X1=42; ~Fault(P0); pacda(x,0x35)=x;
0:X1=53; Fault(P0,x,D-MMU:Translation);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A15.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A15 Required
States 2
0:X3=0; ~Fault(P0,MMU:Translation); pacda(x,0x35)=x;
0:X3=0; ~Fault(P0,MMU:Translation); pacda(x,0x35)=x;
0:X3=42; Fault(P0,x,MMU:Translation);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A16.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A16 Required
States 4
0:X4=0; ~Fault(P2,MMU:Translation); ~Fault(P1,MMU:Translation); pacdb(x,0x2a)=x; pacda(x,0x35)=x;
0:X4=0; ~Fault(P2,MMU:Translation); ~Fault(P1,MMU:Translation); pacdb(x,0x2a)=x; pacda(x,0x35)=x;
0:X4=1; Fault(P1,x,MMU:Translation); ~Fault(P2,MMU:Translation); pacdb(x,0x2a)=x;
0:X4=1; Fault(P1,x,MMU:Translation); Fault(P2,x,MMU:Translation);
0:X4=1; Fault(P2,x,MMU:Translation); ~Fault(P1,MMU:Translation); pacda(x,0x35)=x;
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A17.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A17 Required
States 4
0:X4=0; ~Fault(P2,MMU:Translation); ~Fault(P1,MMU:Translation); pacia(x,0x2a)=x; pacda(x,0x35)=x;
0:X4=0; ~Fault(P2,MMU:Translation); ~Fault(P1,MMU:Translation); pacia(x,0x2a)=x; pacda(x,0x35)=x;
0:X4=0; Fault(P1,x,MMU:Translation); Fault(P2,x,MMU:Translation);
0:X4=1; Fault(P1,x,MMU:Translation); ~Fault(P2,MMU:Translation); pacia(x,0x2a)=x;
0:X4=1; Fault(P2,x,MMU:Translation); ~Fault(P1,MMU:Translation); pacda(x,0x35)=x;
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A20.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A20 Required
States 1
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A21.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A21 Required
States 1
0:X1=42; ~Fault(P0);
0:X1=42; ~Fault(P0);
Ok
Witnesses
Positive: 1 Negative: 0
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A22.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Test A22 Allowed
States 2
~Fault(P0,MMU:Translation); pacda(x,0x0)=x;
~Fault(P0,MMU:Translation); pacda(x,0x0)=x;
Fault(P0,x,MMU:Translation);
Ok
Witnesses
Expand Down
2 changes: 1 addition & 1 deletion herd/tests/instructions/AArch64.PAC/A23.litmus.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Test A23 Allowed
States 2
0:X1=0; Fault(P0,x,MMU:Translation);
0:X1=42; ~Fault(P0,MMU:Translation); pacda(x,0x0)=x;
0:X1=42; ~Fault(P0,MMU:Translation); pacda(x,0x0)=x;
Ok
Witnesses
Positive: 1 Negative: 1
Expand Down
Loading
Loading