From 0f32be4f49c9ab4dbc7b0147d36e04fefc2b274c Mon Sep 17 00:00:00 2001
From: Robert Norton
Date: Fri, 7 Apr 2017 16:20:05 +0100
Subject: simplify xor using ocaml <> operator which also has the advantage of
 being more correct

---
 src/gen_lib/sail_values.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/gen_lib/sail_values.ml b/src/gen_lib/sail_values.ml
index ebde00a7..31605849 100644
--- a/src/gen_lib/sail_values.ml
+++ b/src/gen_lib/sail_values.ml
@@ -320,7 +320,7 @@ let bitwise_binop_bit op (l,r) =
 
 let bitwise_and_bit = bitwise_binop_bit (&&)
 let bitwise_or_bit = bitwise_binop_bit (||)
-let bitwise_xor_bit = bitwise_binop_bit (fun x y -> (1 = (if x then 1 else 0) lxor (if y then 1 else 0)))
+let bitwise_xor_bit = bitwise_binop_bit (<>)
 
 let bitwise_binop op (l,r) =
   let bop l arrayl arrayr =
@@ -344,7 +344,7 @@ let bitwise_binop op (l,r) =
 
 let bitwise_and = bitwise_binop (&&)
 let bitwise_or = bitwise_binop (||)
-let bitwise_xor = bitwise_binop (fun x y -> (1 = (if x then 1 else 0) lxor (if y then 0 else 1)))
+let bitwise_xor = bitwise_binop (<>)
 
 let rec power_int base raiseto =
   if raiseto = 0
-- 
cgit v1.2.3