Skip to content

Commit 8a76b04

Browse files
dschuffdschuff
committedNov 5, 2015
[WebAssembly] Rename ior operator to or to match the spec
Summary: The spec uses "or" for inclusive-or and "xor" for exclusive-or Reviewers: sunfish Subscribers: jfb, llvm-commits, dschuff Differential Revision: http://reviews.llvm.org/D14362 llvm-svn: 252174
1 parent 95246e7 commit 8a76b04

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed
 

‎llvm/lib/Target/WebAssembly/WebAssemblyInstrInteger.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ defm DIV_U : BinaryInt<udiv>;
2020
defm REM_S : BinaryInt<srem>;
2121
defm REM_U : BinaryInt<urem>;
2222
defm AND : BinaryInt<and>;
23-
defm IOR : BinaryInt<or>;
23+
defm OR : BinaryInt<or>;
2424
defm XOR : BinaryInt<xor>;
2525
defm SHL : BinaryInt<shl>;
2626
defm SHR_U : BinaryInt<srl>;

‎llvm/test/CodeGen/WebAssembly/comparisons_f32.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ define i32 @ord_f32(float %x, float %y) {
4141
; CHECK-NEXT: set_local 4, pop{{$}}
4242
; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
4343
; CHECK-NEXT: set_local 5, pop{{$}}
44-
; CHECK-NEXT: ior (get_local 5), (get_local 4){{$}}
44+
; CHECK-NEXT: or (get_local 5), (get_local 4){{$}}
4545
; CHECK-NEXT: set_local 6, pop{{$}}
4646
; CHECK-NEXT: return (get_local 6){{$}}
4747
define i32 @uno_f32(float %x, float %y) {
@@ -130,9 +130,9 @@ define i32 @oge_f32(float %x, float %y) {
130130
; CHECK-NEXT: set_local 5, pop{{$}}
131131
; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
132132
; CHECK-NEXT: set_local 6, pop{{$}}
133-
; CHECK-NEXT: ior (get_local 6), (get_local 5){{$}}
133+
; CHECK-NEXT: or (get_local 6), (get_local 5){{$}}
134134
; CHECK-NEXT: set_local 7, pop{{$}}
135-
; CHECK-NEXT: ior (get_local 4), (get_local 7){{$}}
135+
; CHECK-NEXT: or (get_local 4), (get_local 7){{$}}
136136
; CHECK-NEXT: set_local 8, pop{{$}}
137137
; CHECK-NEXT: return (get_local 8){{$}}
138138
define i32 @ueq_f32(float %x, float %y) {

‎llvm/test/CodeGen/WebAssembly/comparisons_f64.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ define i32 @ord_f64(double %x, double %y) {
4141
; CHECK-NEXT: set_local 4, pop{{$}}
4242
; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
4343
; CHECK-NEXT: set_local 5, pop{{$}}
44-
; CHECK-NEXT: ior (get_local 5), (get_local 4){{$}}
44+
; CHECK-NEXT: or (get_local 5), (get_local 4){{$}}
4545
; CHECK-NEXT: set_local 6, pop{{$}}
4646
; CHECK-NEXT: return (get_local 6){{$}}
4747
define i32 @uno_f64(double %x, double %y) {
@@ -130,9 +130,9 @@ define i32 @oge_f64(double %x, double %y) {
130130
; CHECK-NEXT: set_local 5, pop{{$}}
131131
; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
132132
; CHECK-NEXT: set_local 6, pop{{$}}
133-
; CHECK-NEXT: ior (get_local 6), (get_local 5){{$}}
133+
; CHECK-NEXT: or (get_local 6), (get_local 5){{$}}
134134
; CHECK-NEXT: set_local 7, pop{{$}}
135-
; CHECK-NEXT: ior (get_local 4), (get_local 7){{$}}
135+
; CHECK-NEXT: or (get_local 4), (get_local 7){{$}}
136136
; CHECK-NEXT: set_local 8, pop{{$}}
137137
; CHECK-NEXT: return (get_local 8){{$}}
138138
define i32 @ueq_f64(double %x, double %y) {

‎llvm/test/CodeGen/WebAssembly/i32.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ define i32 @and32(i32 %x, i32 %y) {
145145
ret i32 %a
146146
}
147147

148-
; CHECK-LABEL: ior32:
148+
; CHECK-LABEL: or32:
149149
; CHECK-NEXT: .param i32{{$}}
150150
; CHECK-NEXT: .param i32{{$}}
151151
; CHECK-NEXT: .result i32{{$}}
@@ -154,10 +154,10 @@ define i32 @and32(i32 %x, i32 %y) {
154154
; CHECK-NEXT: set_local 2, pop{{$}}
155155
; CHECK-NEXT: get_local 0{{$}}
156156
; CHECK-NEXT: set_local 3, pop{{$}}
157-
; CHECK-NEXT: ior (get_local 3), (get_local 2){{$}}
157+
; CHECK-NEXT: or (get_local 3), (get_local 2){{$}}
158158
; CHECK-NEXT: set_local 4, pop{{$}}
159159
; CHECK-NEXT: return (get_local 4){{$}}
160-
define i32 @ior32(i32 %x, i32 %y) {
160+
define i32 @or32(i32 %x, i32 %y) {
161161
%a = or i32 %x, %y
162162
ret i32 %a
163163
}

‎llvm/test/CodeGen/WebAssembly/i64.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ define i64 @and64(i64 %x, i64 %y) {
145145
ret i64 %a
146146
}
147147

148-
; CHECK-LABEL: ior64:
148+
; CHECK-LABEL: or64:
149149
; CHECK-NEXT: .param i64{{$}}
150150
; CHECK-NEXT: .param i64{{$}}
151151
; CHECK-NEXT: .result i64{{$}}
@@ -154,10 +154,10 @@ define i64 @and64(i64 %x, i64 %y) {
154154
; CHECK-NEXT: set_local 2, pop{{$}}
155155
; CHECK-NEXT: get_local 0{{$}}
156156
; CHECK-NEXT: set_local 3, pop{{$}}
157-
; CHECK-NEXT: ior (get_local 3), (get_local 2){{$}}
157+
; CHECK-NEXT: or (get_local 3), (get_local 2){{$}}
158158
; CHECK-NEXT: set_local 4, pop{{$}}
159159
; CHECK-NEXT: return (get_local 4){{$}}
160-
define i64 @ior64(i64 %x, i64 %y) {
160+
define i64 @or64(i64 %x, i64 %y) {
161161
%a = or i64 %x, %y
162162
ret i64 %a
163163
}

0 commit comments

Comments
 (0)
Please sign in to comment.