Skip to content

Commit 1d2f3f7

Browse files
alastairreidalastairreid
committed
Cleanup: change EOR/eor/Eor to XOR/xor/Xor
This brings internal names into line with the external syntax. Signed-off-by: Alastair Reid <[email protected]>
1 parent 22a233b commit 1d2f3f7

27 files changed

+119
-118
lines changed

‎libASL/asl_ast.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ binop =
4141
| Binop_BoolIff
4242
| Binop_BoolImplies
4343
| Binop_BitOr
44-
| Binop_BitEor
44+
| Binop_BitXor
4545
| Binop_BitAnd
4646
| Binop_Append
4747
| Binop_DUMMY
@@ -208,7 +208,7 @@ let associativeOperators: binop list =
208208
; Binop_BoolAnd
209209
; Binop_BoolOr
210210
; Binop_BitOr
211-
; Binop_BitEor
211+
; Binop_BitXor
212212
; Binop_BitAnd
213213
; Binop_Append
214214
]
@@ -246,7 +246,7 @@ let miscOperators: binop list =
246246
; Binop_ShiftL
247247
; Binop_ShiftR
248248
; Binop_BitOr
249-
; Binop_BitEor
249+
; Binop_BitXor
250250
; Binop_BitAnd
251251
]
252252

‎libASL/asl_fmt.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ let star (fmt : PP.formatter) : unit = delimiter fmt "*"
102102
let kw_and (fmt : PP.formatter) : unit = delimiter fmt "AND"
103103
let kw_div_exact (fmt : PP.formatter) : unit = delimiter fmt "DIV"
104104
let kw_divrm (fmt : PP.formatter) : unit = delimiter fmt "DIVRM"
105-
let kw_eor (fmt : PP.formatter) : unit = delimiter fmt "EOR"
106105
let kw_in (fmt : PP.formatter) : unit = delimiter fmt "IN"
107106
let kw_mod (fmt : PP.formatter) : unit = delimiter fmt "MOD"
108107
let kw_not (fmt : PP.formatter) : unit = delimiter fmt "NOT"
@@ -154,6 +153,7 @@ let kw_var (fmt : PP.formatter) : unit = keyword fmt "var"
154153
let kw_when (fmt : PP.formatter) : unit = keyword fmt "when"
155154
let kw_where (fmt : PP.formatter) : unit = keyword fmt "where"
156155
let kw_while (fmt : PP.formatter) : unit = keyword fmt "while"
156+
let kw_xor (fmt : PP.formatter) : unit = delimiter fmt "XOR"
157157

158158
type comment = Lexing.position * Lexing.position * string
159159

@@ -260,7 +260,7 @@ let binop (fmt : PP.formatter) (x : AST.binop) : unit =
260260
| Binop_BoolIff -> lt_minus_gt fmt
261261
| Binop_BoolImplies -> minus_minus_gt fmt
262262
| Binop_BitOr -> kw_or fmt
263-
| Binop_BitEor -> kw_eor fmt
263+
| Binop_BitXor -> kw_xor fmt
264264
| Binop_BitAnd -> kw_and fmt
265265
| Binop_Append -> plus_plus fmt
266266
| Binop_DUMMY ->

‎libASL/asl_fmt.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ val kw_else : formatter -> unit
109109
val kw_elsif : formatter -> unit
110110
val kw_enumeration : formatter -> unit
111111
val kw_end : formatter -> unit
112-
val kw_eor : formatter -> unit
113112
val kw_for : formatter -> unit
114113
val kw_func : formatter -> unit
115114
val kw_getter : formatter -> unit
@@ -145,6 +144,7 @@ val kw_until : formatter -> unit
145144
val kw_var : formatter -> unit
146145
val kw_when : formatter -> unit
147146
val kw_while : formatter -> unit
147+
val kw_xor : formatter -> unit
148148

149149
(*****************************************
150150
* End

‎libASL/asl_parser.messages

+74-74
Large diffs are not rendered by default.

‎libASL/asl_parser.mly

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ let type_unknown = Type_Constructor (Ident.mk_ident "<type_unknown>", [])
117117
%token DIV (* DIV *)
118118
%token DIVRM (* DIVRM *)
119119
%token EQ_EQ (* == *)
120-
%token EOR (* EOR *)
121120
%token GT (* > *)
122121
%token GT_EQ (* >= *)
123122
%token GT_GT (* >> *)
@@ -136,6 +135,7 @@ let type_unknown = Type_Constructor (Ident.mk_ident "<type_unknown>", [])
136135
%token REM (* REM *)
137136
%token SLASH (* / *)
138137
%token STAR (* * *)
138+
%token XOR (* XOR *)
139139

140140
(* unop tokens *)
141141
%token BANG (* ! *)
@@ -543,7 +543,7 @@ binop:
543543
| LT_MINUS_GT { Binop_BoolIff }
544544
| MINUS_MINUS_GT { Binop_BoolImplies }
545545
| OR { Binop_BitOr }
546-
| EOR { Binop_BitEor }
546+
| XOR { Binop_BitXor }
547547
| AND { Binop_BitAnd }
548548
| PLUS_PLUS { Binop_Append }
549549

‎libASL/backend_c.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ and funcall (loc : Loc.t) (fmt : PP.formatter) (f : Ident.t) (tes : AST.expr lis
715715
]
716716
| [ x; n ] when Ident.equal f cvt_int_bits ->
717717
apply_bits_builtin loc fmt (fun _ -> fn_extern fmt f) [ n ] [ n; x ]
718-
| _ when Ident.in_list f [ eor_bits; eq_bits ] ->
718+
| _ when Ident.in_list f [ xor_bits; eq_bits ] ->
719719
let n = List.hd tes in
720720
apply_bits_builtin loc fmt (fun _ -> fn_extern fmt f) [ n ] (n :: args)
721721
| [ w; _ ] when Ident.equal f Builtin_idents.mk_mask ->

‎libASL/backend_c_new.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ and funcall (loc : Loc.t) (fmt : PP.formatter) (f : Ident.t) (tes : AST.expr lis
501501
| ([n], [x;y]) when Ident.equal f mul_bits -> Runtime.mul_bits fmt n (mk_expr loc x) (mk_expr loc y)
502502
| ([n], [x;y]) when Ident.equal f and_bits -> Runtime.and_bits fmt n (mk_expr loc x) (mk_expr loc y)
503503
| ([n], [x;y]) when Ident.equal f or_bits -> Runtime.or_bits fmt n (mk_expr loc x) (mk_expr loc y)
504-
| ([n], [x;y]) when Ident.equal f eor_bits -> Runtime.eor_bits fmt n (mk_expr loc x) (mk_expr loc y)
504+
| ([n], [x;y]) when Ident.equal f xor_bits -> Runtime.xor_bits fmt n (mk_expr loc x) (mk_expr loc y)
505505
| ([n], [x]) when Ident.equal f not_bits -> Runtime.not_bits fmt n (mk_expr loc x)
506506
| ([n], [x;y]) when Ident.equal f lsl_bits -> Runtime.lsl_bits fmt n (mk_expr loc x) (mk_expr loc y)
507507
| ([n], [x;y]) when Ident.equal f lsr_bits -> Runtime.lsr_bits fmt n (mk_expr loc x) (mk_expr loc y)

‎libASL/backend_cpp.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ and funcall (loc : Loc.t) (fmt : PP.formatter) (f : Ident.t) (tes : AST.expr lis
826826
| _ when Ident.equal f ne_bits -> binop loc fmt "!=" args
827827
| _ when Ident.equal f mul_bits -> binop loc fmt "*" args
828828
| _ when Ident.equal f or_bits -> binop loc fmt "|" args
829-
| _ when Ident.equal f eor_bits -> binop loc fmt "^" args
829+
| _ when Ident.equal f xor_bits -> binop loc fmt "^" args
830830
| _ when Ident.equal f lsl_bits -> binop loc fmt "<<" args
831831
| _ when Ident.equal f lsr_bits -> binop loc fmt ">>" args
832832
| _ when Ident.equal f add_bits -> binop loc fmt "+" args

‎libASL/builtin_idents.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ let sub_real = Ident.mk_fident "asl_sub_real"
6969
let cvt_bits_sint = Ident.mk_fident "asl_cvt_bits_sint"
7070
let cvt_bits_uint = Ident.mk_fident "asl_cvt_bits_uint"
7171
let cvt_int_bits = Ident.mk_fident "asl_cvt_int_bits"
72-
let eor_bits = Ident.mk_fident "asl_eor_bits"
72+
let xor_bits = Ident.mk_fident "asl_xor_bits"
7373
let frem_bits_int = Ident.mk_fident "asl_frem_bits_int"
7474
let notin_mask = Ident.mk_fident "asl_notin_mask"
7575
let asr_bits = Ident.mk_fident "asl_asr_bits"

‎libASL/builtin_idents.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ val sub_real : Ident.t
7272
val cvt_bits_sint : Ident.t
7373
val cvt_bits_uint : Ident.t
7474
val cvt_int_bits : Ident.t
75-
val eor_bits : Ident.t
75+
val xor_bits : Ident.t
7676
val frem_bits_int : Ident.t
7777
val notin_mask : Ident.t
7878
val asr_bits : Ident.t

‎libASL/lexer.mll

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ let keywords : (string * Asl_parser.token) list = [
1515
("AND", AND);
1616
("DIV", DIV);
1717
("DIVRM", DIVRM);
18-
("EOR", EOR);
18+
("EOR", XOR);
1919
("IN", IN);
2020
("MOD", MOD);
2121
("NOT", NOT);
2222
("OR", OR);
2323
("QUOT", QUOT);
2424
("REM", REM);
2525
("UNKNOWN", UNKNOWN);
26-
("XOR", EOR);
26+
("XOR", XOR);
2727
("__assert", UNDERSCORE_UNDERSCORE_ASSERT);
2828
("__builtin", UNDERSCORE_UNDERSCORE_BUILTIN);
2929
("__in", UNDERSCORE_UNDERSCORE_IN);

‎libASL/lexersupport.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ let string_of_token (t : Asl_parser.token) : string =
4747
| ENUMERATION -> "enum"
4848
| EXCEPTION -> "exception"
4949
| EOF -> "eof"
50-
| EOR -> "eor"
5150
| EQ -> "eq"
5251
| EQ_EQ -> "eqeq"
5352
| EQ_GT -> "eqgt"
@@ -112,6 +111,7 @@ let string_of_token (t : Asl_parser.token) : string =
112111
| WHEN -> "when"
113112
| WHERE -> "where"
114113
| WHILE -> "while"
114+
| XOR -> "xor"
115115

116116
let print_position outx lexbuf =
117117
let pos = lexbuf.lex_curr_p in

‎libASL/primops.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ let prim_and_bits (x : bitvector) (y : bitvector) : bitvector =
189189
let prim_or_bits (x : bitvector) (y : bitvector) : bitvector =
190190
mkBits x.n (Z.logor x.v y.v)
191191

192-
let prim_eor_bits (x : bitvector) (y : bitvector) : bitvector =
192+
let prim_xor_bits (x : bitvector) (y : bitvector) : bitvector =
193193
mkBits x.n (Z.logxor x.v y.v)
194194

195195
let prim_not_bits (x : bitvector) : bitvector = mkBits x.n (Z.lognot x.v)

‎libASL/runtime.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ module type RuntimeLib = sig
106106
val mul_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
107107
val and_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
108108
val or_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
109-
val eor_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
109+
val xor_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
110110
val not_bits : PP.formatter -> int -> rt_expr -> unit
111111
val lsl_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
112112
val lsr_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit

‎libASL/runtime.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ module type RuntimeLib = sig
105105
val mul_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
106106
val and_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
107107
val or_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
108-
val eor_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
108+
val xor_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
109109
val not_bits : PP.formatter -> int -> rt_expr -> unit
110110
val lsl_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit
111111
val lsr_bits : PP.formatter -> int -> rt_expr -> rt_expr -> unit

‎libASL/runtime_ac.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ module Runtime : RT.RuntimeLib = struct
403403
let mul_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "*" x y
404404
let and_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "&" x y
405405
let or_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "|" x y
406-
let eor_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "^" x y
406+
let xor_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "^" x y
407407

408408
let not_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) : unit =
409409
if n = 0 then

‎libASL/runtime_c23.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ module Runtime : RT.RuntimeLib = struct
435435
let mul_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop_bits fmt n "*" x y
436436
let and_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "&" x y
437437
let or_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "|" x y
438-
let eor_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "^" x y
438+
let xor_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "^" x y
439439

440440
let not_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) : unit =
441441
if n = 0 then

‎libASL/runtime_fallback.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ module Runtime : RT.RuntimeLib = struct
293293
let mul_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = apply_bits_1_2 fmt "mul_bits" n x y
294294
let and_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = apply_bits_1_2 fmt "and_bits" n x y
295295
let or_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = apply_bits_1_2 fmt "or_bits" n x y
296-
let eor_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = apply_bits_1_2 fmt "eor_bits" n x y
296+
let xor_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = apply_bits_1_2 fmt "xor_bits" n x y
297297
let not_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) : unit = apply_bits_1_1 fmt "not_bits" n x
298298
let lsl_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = apply_bits_1_2 fmt "lsl_bits" n x y
299299
let lsr_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = apply_bits_1_2 fmt "lsr_bits" n x y

‎libASL/runtime_sc.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ module Runtime : RT.RuntimeLib = struct
426426
let mul_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "*" x y
427427
let and_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "&" x y
428428
let or_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "|" x y
429-
let eor_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "^" x y
429+
let xor_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) (y : RT.rt_expr) : unit = binop fmt "^" x y
430430

431431
let not_bits (fmt : PP.formatter) (n : int) (x : RT.rt_expr) : unit =
432432
if n = 0 then

‎libASL/value.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,8 @@ let eval_prim (f : Ident.t) (tvs : value list) (vs : value list) : value option
609609
Some (VBits (prim_and_bits x y))
610610
| [ VInt n ], [ VBits x; VBits y ] when Ident.equal f or_bits ->
611611
Some (VBits (prim_or_bits x y))
612-
| [ VInt n ], [ VBits x; VBits y ] when Ident.equal f eor_bits ->
613-
Some (VBits (prim_eor_bits x y))
612+
| [ VInt n ], [ VBits x; VBits y ] when Ident.equal f xor_bits ->
613+
Some (VBits (prim_xor_bits x y))
614614
| [ VInt n ], [ VBits x ] when Ident.equal f not_bits ->
615615
Some (VBits (prim_not_bits x))
616616
| [ VInt n ], [_] when Ident.equal f zeros_bits ->

‎prelude.asl

+6-5
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ __builtin func asl_sub_bits{N}(x : bits(N), y : bits(N)) => bits(N);
7676
__builtin func asl_mul_bits{N}(x : bits(N), y : bits(N)) => bits(N);
7777
__builtin func asl_and_bits{N}(x : bits(N), y : bits(N)) => bits(N);
7878
__builtin func asl_or_bits{N}(x : bits(N), y : bits(N)) => bits(N);
79-
__builtin func asl_eor_bits{N}(x : bits(N), y : bits(N)) => bits(N);
79+
__builtin func asl_xor_bits{N}(x : bits(N), y : bits(N)) => bits(N);
8080
__builtin func asl_not_bits{N}(x : bits(N)) => bits(N);
8181
__builtin func asl_zeros_bits(N : integer) => bits(N);
8282
__builtin func asl_ones_bits(N : integer) => bits(N);
@@ -329,7 +329,8 @@ __operator2 MOD = asl_frem_int, asl_frem_bits_int;
329329

330330
__operator2 AND = asl_and_bits;
331331
__operator2 OR = asl_or_bits;
332-
__operator2 EOR = asl_eor_bits;
332+
__operator2 EOR = asl_xor_bits; // deprecated synonym for XOR
333+
__operator2 XOR = asl_xor_bits;
333334
__operator1 NOT = asl_not_bits;
334335

335336
func asl_append_str_bool(x : string, y : boolean) => string
@@ -631,7 +632,7 @@ end
631632
// bits following the leading bit, that are equal to it.
632633
func CountLeadingSignBits(x : bits(N)) => integer {0 .. N}
633634
begin
634-
return CountLeadingZeroBits(x[N-1:1] EOR x[N-2:0]);
635+
return CountLeadingZeroBits(x[N-1:1] XOR x[N-2:0]);
635636
end
636637

637638
// Treating input as an integer, align down to nearest multiple of 2^y.
@@ -690,7 +691,7 @@ func IsParityEven(x : bits(N)) => boolean
690691
begin
691692
var r : bit = '0';
692693
for i = 0 to N - 1 do
693-
r = r EOR x[i];
694+
r = r XOR x[i];
694695
end
695696
return r == '0';
696697
end
@@ -699,7 +700,7 @@ func IsParityOdd(x : bits(N)) => boolean
699700
begin
700701
var r : bit = '0';
701702
for i = 0 to N - 1 do
702-
r = r EOR x[i];
703+
r = r XOR x[i];
703704
end
704705
return r == '1';
705706
end

‎runtime/include/asl/bits64.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ ASL_int_t ASL_cvt_bits_uint_64(int width, ASL_bits64_t x);
8585

8686
ASL_bits64_t ASL_cvt_int_bits_64(int width, ASL_int_t x);
8787

88-
#define ASL_eor_bits(sizeof_x, n, x, y) \
89-
ASL_CC(ASL_eor_bits_, sizeof_x)(n, x, y)
88+
#define ASL_xor_bits(sizeof_x, n, x, y) \
89+
ASL_CC(ASL_xor_bits_, sizeof_x)(n, x, y)
9090

91-
ASL_bits64_t ASL_eor_bits_64(int width, ASL_bits64_t x, ASL_bits64_t y);
91+
ASL_bits64_t ASL_xor_bits_64(int width, ASL_bits64_t x, ASL_bits64_t y);
9292

9393
#define ASL_eq_bits(sizeof_x, n, x, y) \
9494
ASL_CC(ASL_eq_bits_, sizeof_x)(n, x, y)

‎runtime/include/asl/bits_template.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ASL_BITS_TYPE ASL_asr_bits(N, int width, ASL_BITS_TYPE x, ASL_int_t d);
1414
ASL_int_t ASL_cvt_bits_sint(N, int width, ASL_BITS_TYPE x);
1515
ASL_int_t ASL_cvt_bits_uint(N, int width, ASL_BITS_TYPE x);
1616
ASL_BITS_TYPE ASL_cvt_int_bits(N, int width, ASL_int_t x);
17-
ASL_BITS_TYPE ASL_eor_bits(N, int width, ASL_BITS_TYPE x, ASL_BITS_TYPE y);
17+
ASL_BITS_TYPE ASL_xor_bits(N, int width, ASL_BITS_TYPE x, ASL_BITS_TYPE y);
1818
bool ASL_eq_bits(N, int width, ASL_BITS_TYPE x, ASL_BITS_TYPE y);
1919
ASL_BITS_TYPE ASL_mk_mask(N, ASL_int_t width);
2020
bool ASL_ne_bits(N, int width, ASL_BITS_TYPE x, ASL_BITS_TYPE y);

‎runtime/lib/bits64.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ASL_cvt_int_bits_64(int width, ASL_int_t x)
7676
}
7777

7878
ASL_bits64_t
79-
ASL_eor_bits_64(int width, ASL_bits64_t x, ASL_bits64_t y)
79+
ASL_xor_bits_64(int width, ASL_bits64_t x, ASL_bits64_t y)
8080
{
8181
return x ^ y;
8282
}

‎runtime/lib/bits_template_c.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ASL_eq_bits(N, int width, ASL_BITS_TYPE x, ASL_BITS_TYPE y)
105105
}
106106

107107
ASL_BITS_TYPE
108-
ASL_eor_bits(N, int width, ASL_BITS_TYPE x, ASL_BITS_TYPE y)
108+
ASL_xor_bits(N, int width, ASL_BITS_TYPE x, ASL_BITS_TYPE y)
109109
{
110110
for (int i = 0; i < ASL_BITS_LIMBS_64; ++i)
111111
x.u64[i] ^= y.u64[i];

‎runtime/test/bits_test.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ TEST_F(Bits64, CvtIntBits)
7373
EXPECT_EQ(6ULL, ASL_cvt_int_bits_64(width, -2LL));
7474
}
7575

76-
TEST_F(Bits64, Eor)
76+
TEST_F(Bits64, Xor)
7777
{
78-
EXPECT_EQ(zeros, ASL_eor_bits_64(64, zeros, zeros));
79-
EXPECT_EQ(zeros, ASL_eor_bits_64(64, ones, ones));
80-
EXPECT_EQ( ones, ASL_eor_bits_64(64, zeros, ones));
78+
EXPECT_EQ(zeros, ASL_xor_bits_64(64, zeros, zeros));
79+
EXPECT_EQ(zeros, ASL_xor_bits_64(64, ones, ones));
80+
EXPECT_EQ( ones, ASL_xor_bits_64(64, zeros, ones));
8181
}
8282

8383
TEST_F(Bits64, Eq)

‎runtime/test/bits_test_template.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ TEST_F(ASL_CC_INDIR(Bits, N), CvtIntBits)
8989
EXPECT_EQ(r, ASL_cvt_int_bits(N, width, -1LL));
9090
}
9191

92-
TEST_F(ASL_CC_INDIR(Bits, N), Eor)
92+
TEST_F(ASL_CC_INDIR(Bits, N), Xor)
9393
{
94-
EXPECT_EQ(zeros, ASL_eor_bits(N, N, zeros, zeros));
95-
EXPECT_EQ(zeros, ASL_eor_bits(N, N, ones, ones));
96-
EXPECT_EQ( ones, ASL_eor_bits(N, N, zeros, ones));
94+
EXPECT_EQ(zeros, ASL_xor_bits(N, N, zeros, zeros));
95+
EXPECT_EQ(zeros, ASL_xor_bits(N, N, ones, ones));
96+
EXPECT_EQ( ones, ASL_xor_bits(N, N, zeros, ones));
9797
}
9898

9999
TEST_F(ASL_CC_INDIR(Bits, N), Eq)

0 commit comments

Comments
 (0)