From aa733ed518e6fc4ebc901465eee4afb5d4ddeb34 Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis
Date: Thu, 13 Mar 2014 17:40:10 +0000
Subject: Make test_power compiling again

---
 src/test/power.sail | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/test')

diff --git a/src/test/power.sail b/src/test/power.sail
index fc90c654..ba7d76c7 100644
--- a/src/test/power.sail
+++ b/src/test/power.sail
@@ -62,8 +62,8 @@ scattered function ast decode
   {
     if  mode64bit  then  M  :=  0  else  M  :=  32  ;
     if  (  ~  (  ((  BO  )[  2  ])  ))  then  CTR  :=  (  CTR  -  1  )  ;
-    ctr_ok  :=  (  ((  BO  )[  2  ])  ||  (  (  ((  CTR  )[  M  ..  63  ])  !=  0  )  ^  ((  BO  )[  3  ])  )  )  ;
-    cond_ok  :=  (  ((  BO  )[  0  ])  ||  (  ((  CR  )[  (  BI  +  32  )  ])  ^  (  ~  (  ((  BO  )[  1  ])  ))  )  )  ;
+    ctr_ok  :=  (  ((  BO  )[  2  ])  |  (  (  ((  CTR  )[  M  ..  63  ])  !=  0  )  ^  ((  BO  )[  3  ])  )  )  ;
+    cond_ok  :=  (  ((  BO  )[  0  ])  |  (  ((  CR  )[  (  BI  +  32  )  ])  ^  (  ~  (  ((  BO  )[  1  ])  ))  )  )  ;
     if  (  ctr_ok  &  cond_ok  )  then  NIA  :=  (  ((  LR  )[  0  ..  61  ])  :  0b00  )  ;
     if  LK  then  LR  :=  (  CIA  +  4  )  ;
   } 
@@ -87,7 +87,7 @@ scattered function ast decode
   OR  (  instr[11..15] (* RA *), instr[16..20] (* RB *), instr[6..10] (* RS *), instr[31] (* Rc *)  ) 
 
  function clause execute (  OR  (  RA, RB, RS, Rc  )  ) =
-  GPR[  RA  ]  :=  (  (GPR[  RS  ])  ||  (GPR[  RB  ])  ) 
+  GPR[  RA  ]  :=  (  (GPR[  RS  ])  |  (GPR[  RB  ])  ) 
 
  union ast member  bit [ 15 ] (* D *) * bit [ 4 ] (* RA *) * bit [ 4 ] (* RS *)  StoreWord 
 
-- 
cgit v1.2.3