Skip to content

Commit 6e876dc

Browse files
atrosinenkoatrosinenko
committed
Replace si_int by native_int for some other helpers
1 parent c8ed6f6 commit 6e876dc

17 files changed

+124
-124
lines changed

‎compiler-rt/lib/builtins/README.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ long double __floatuntixf(tu_int a);
169169

170170
// Floating point raised to integer power
171171

172-
float __powisf2( float a, si_int b); // a ^ b
173-
double __powidf2( double a, si_int b); // a ^ b
174-
long double __powixf2(long double a, si_int b); // a ^ b
175-
long double __powitf2(long double a, si_int b); // ppc only, a ^ b
172+
float __powisf2( float a, native_int b); // a ^ b
173+
double __powidf2( double a, native_int b); // a ^ b
174+
long double __powixf2(long double a, native_int b); // a ^ b
175+
long double __powitf2(long double a, native_int b); // ppc only, a ^ b
176176

177177
// Complex arithmetic
178178

‎compiler-rt/lib/builtins/cmpdi2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// if (a == b) returns 1
1717
// if (a > b) returns 2
1818

19-
COMPILER_RT_ABI si_int __cmpdi2(di_int a, di_int b) {
19+
COMPILER_RT_ABI native_int __cmpdi2(di_int a, di_int b) {
2020
dwords x;
2121
x.all = a;
2222
dwords y;

‎compiler-rt/lib/builtins/cmpti2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// if (a == b) returns 1
1919
// if (a > b) returns 2
2020

21-
COMPILER_RT_ABI si_int __cmpti2(ti_int a, ti_int b) {
21+
COMPILER_RT_ABI native_int __cmpti2(ti_int a, ti_int b) {
2222
twords x;
2323
x.all = a;
2424
twords y;

‎compiler-rt/lib/builtins/powidf2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// Returns: a ^ b
1616

17-
COMPILER_RT_ABI double __powidf2(double a, si_int b) {
17+
COMPILER_RT_ABI double __powidf2(double a, native_int b) {
1818
const int recip = b < 0;
1919
double r = 1;
2020
while (1) {

‎compiler-rt/lib/builtins/powisf2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// Returns: a ^ b
1616

17-
COMPILER_RT_ABI float __powisf2(float a, si_int b) {
17+
COMPILER_RT_ABI float __powisf2(float a, native_int b) {
1818
const int recip = b < 0;
1919
float r = 1;
2020
while (1) {

‎compiler-rt/lib/builtins/powitf2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
// Returns: a ^ b
1919

20-
COMPILER_RT_ABI long double __powitf2(long double a, si_int b) {
20+
COMPILER_RT_ABI long double __powitf2(long double a, native_int b) {
2121
const int recip = b < 0;
2222
long double r = 1;
2323
while (1) {

‎compiler-rt/lib/builtins/powixf2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
// Returns: a ^ b
1818

19-
COMPILER_RT_ABI long double __powixf2(long double a, si_int b) {
19+
COMPILER_RT_ABI long double __powixf2(long double a, native_int b) {
2020
const int recip = b < 0;
2121
long double r = 1;
2222
while (1) {

‎compiler-rt/lib/builtins/ucmpdi2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// if (a == b) returns 1
1717
// if (a > b) returns 2
1818

19-
COMPILER_RT_ABI si_int __ucmpdi2(du_int a, du_int b) {
19+
COMPILER_RT_ABI native_int __ucmpdi2(du_int a, du_int b) {
2020
udwords x;
2121
x.all = a;
2222
udwords y;

‎compiler-rt/lib/builtins/ucmpti2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// if (a == b) returns 1
1919
// if (a > b) returns 2
2020

21-
COMPILER_RT_ABI si_int __ucmpti2(tu_int a, tu_int b) {
21+
COMPILER_RT_ABI native_int __ucmpti2(tu_int a, tu_int b) {
2222
utwords x;
2323
x.all = a;
2424
utwords y;

‎compiler-rt/test/builtins/Unit/cmpdi2_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// if (a == b) returns 1
2020
// if (a > b) returns 2
2121

22-
COMPILER_RT_ABI si_int __cmpdi2(di_int a, di_int b);
22+
COMPILER_RT_ABI native_int __cmpdi2(di_int a, di_int b);
2323

2424
int test__cmpdi2(di_int a, di_int b, si_int expected)
2525
{

‎compiler-rt/test/builtins/Unit/cmpti2_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// if (a == b) returns 1
2323
// if (a > b) returns 2
2424

25-
COMPILER_RT_ABI si_int __cmpti2(ti_int a, ti_int b);
25+
COMPILER_RT_ABI native_int __cmpti2(ti_int a, ti_int b);
2626

2727
int test__cmpti2(ti_int a, ti_int b, si_int expected)
2828
{

‎compiler-rt/test/builtins/Unit/powidf2_test.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
// Returns: a ^ b
2020

21-
COMPILER_RT_ABI double __powidf2(double a, si_int b);
21+
COMPILER_RT_ABI double __powidf2(double a, native_int b);
2222

23-
int test__powidf2(double a, si_int b, double expected)
23+
int test__powidf2(double a, native_int b, double expected)
2424
{
2525
double x = __powidf2(a, b);
2626
int correct = (x == expected) && (signbit(x) == signbit(expected));
@@ -62,9 +62,9 @@ int main()
6262
return 1;
6363
if (test__powidf2(0, 4, 0))
6464
return 1;
65-
if (test__powidf2(0, 0x7FFFFFFE, 0))
65+
if (test__powidf2(0, INT_MAX - 1, 0))
6666
return 1;
67-
if (test__powidf2(0, 0x7FFFFFFF, 0))
67+
if (test__powidf2(0, INT_MAX, 0))
6868
return 1;
6969

7070
if (test__powidf2(-0., 1, -0.))
@@ -75,9 +75,9 @@ int main()
7575
return 1;
7676
if (test__powidf2(-0., 4, 0))
7777
return 1;
78-
if (test__powidf2(-0., 0x7FFFFFFE, 0))
78+
if (test__powidf2(-0., INT_MAX - 1, 0))
7979
return 1;
80-
if (test__powidf2(-0., 0x7FFFFFFF, -0.))
80+
if (test__powidf2(-0., INT_MAX, -0.))
8181
return 1;
8282

8383
if (test__powidf2(1, 1, 1))
@@ -88,9 +88,9 @@ int main()
8888
return 1;
8989
if (test__powidf2(1, 4, 1))
9090
return 1;
91-
if (test__powidf2(1, 0x7FFFFFFE, 1))
91+
if (test__powidf2(1, INT_MAX - 1, 1))
9292
return 1;
93-
if (test__powidf2(1, 0x7FFFFFFF, 1))
93+
if (test__powidf2(1, INT_MAX, 1))
9494
return 1;
9595

9696
if (test__powidf2(INFINITY, 1, INFINITY))
@@ -101,9 +101,9 @@ int main()
101101
return 1;
102102
if (test__powidf2(INFINITY, 4, INFINITY))
103103
return 1;
104-
if (test__powidf2(INFINITY, 0x7FFFFFFE, INFINITY))
104+
if (test__powidf2(INFINITY, INT_MAX - 1, INFINITY))
105105
return 1;
106-
if (test__powidf2(INFINITY, 0x7FFFFFFF, INFINITY))
106+
if (test__powidf2(INFINITY, INT_MAX, INFINITY))
107107
return 1;
108108

109109
if (test__powidf2(-INFINITY, 1, -INFINITY))
@@ -114,9 +114,9 @@ int main()
114114
return 1;
115115
if (test__powidf2(-INFINITY, 4, INFINITY))
116116
return 1;
117-
if (test__powidf2(-INFINITY, 0x7FFFFFFE, INFINITY))
117+
if (test__powidf2(-INFINITY, INT_MAX - 1, INFINITY))
118118
return 1;
119-
if (test__powidf2(-INFINITY, 0x7FFFFFFF, -INFINITY))
119+
if (test__powidf2(-INFINITY, INT_MAX, -INFINITY))
120120
return 1;
121121

122122
if (test__powidf2(0, -1, INFINITY))
@@ -127,11 +127,11 @@ int main()
127127
return 1;
128128
if (test__powidf2(0, -4, INFINITY))
129129
return 1;
130-
if (test__powidf2(0, 0x80000002, INFINITY))
130+
if (test__powidf2(0, INT_MIN + 2, INFINITY))
131131
return 1;
132-
if (test__powidf2(0, 0x80000001, INFINITY))
132+
if (test__powidf2(0, INT_MIN + 1, INFINITY))
133133
return 1;
134-
if (test__powidf2(0, 0x80000000, INFINITY))
134+
if (test__powidf2(0, INT_MIN, INFINITY))
135135
return 1;
136136

137137
if (test__powidf2(-0., -1, -INFINITY))
@@ -142,11 +142,11 @@ int main()
142142
return 1;
143143
if (test__powidf2(-0., -4, INFINITY))
144144
return 1;
145-
if (test__powidf2(-0., 0x80000002, INFINITY))
145+
if (test__powidf2(-0., INT_MIN + 2, INFINITY))
146146
return 1;
147-
if (test__powidf2(-0., 0x80000001, -INFINITY))
147+
if (test__powidf2(-0., INT_MIN + 1, -INFINITY))
148148
return 1;
149-
if (test__powidf2(-0., 0x80000000, INFINITY))
149+
if (test__powidf2(-0., INT_MIN, INFINITY))
150150
return 1;
151151

152152
if (test__powidf2(1, -1, 1))
@@ -157,11 +157,11 @@ int main()
157157
return 1;
158158
if (test__powidf2(1, -4, 1))
159159
return 1;
160-
if (test__powidf2(1, 0x80000002, 1))
160+
if (test__powidf2(1, INT_MIN + 2, 1))
161161
return 1;
162-
if (test__powidf2(1, 0x80000001, 1))
162+
if (test__powidf2(1, INT_MIN + 1, 1))
163163
return 1;
164-
if (test__powidf2(1, 0x80000000, 1))
164+
if (test__powidf2(1, INT_MIN, 1))
165165
return 1;
166166

167167
if (test__powidf2(INFINITY, -1, 0))
@@ -172,11 +172,11 @@ int main()
172172
return 1;
173173
if (test__powidf2(INFINITY, -4, 0))
174174
return 1;
175-
if (test__powidf2(INFINITY, 0x80000002, 0))
175+
if (test__powidf2(INFINITY, INT_MIN + 2, 0))
176176
return 1;
177-
if (test__powidf2(INFINITY, 0x80000001, 0))
177+
if (test__powidf2(INFINITY, INT_MIN + 1, 0))
178178
return 1;
179-
if (test__powidf2(INFINITY, 0x80000000, 0))
179+
if (test__powidf2(INFINITY, INT_MIN, 0))
180180
return 1;
181181

182182
if (test__powidf2(-INFINITY, -1, -0.))
@@ -187,11 +187,11 @@ int main()
187187
return 1;
188188
if (test__powidf2(-INFINITY, -4, 0))
189189
return 1;
190-
if (test__powidf2(-INFINITY, 0x80000002, 0))
190+
if (test__powidf2(-INFINITY, INT_MIN + 2, 0))
191191
return 1;
192-
if (test__powidf2(-INFINITY, 0x80000001, -0.))
192+
if (test__powidf2(-INFINITY, INT_MIN + 1, -0.))
193193
return 1;
194-
if (test__powidf2(-INFINITY, 0x80000000, 0))
194+
if (test__powidf2(-INFINITY, INT_MIN, 0))
195195
return 1;
196196

197197
if (test__powidf2(2, 10, 1024.))

‎compiler-rt/test/builtins/Unit/powisf2_test.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
// Returns: a ^ b
2020

21-
COMPILER_RT_ABI float __powisf2(float a, si_int b);
21+
COMPILER_RT_ABI float __powisf2(float a, native_int b);
2222

23-
int test__powisf2(float a, si_int b, float expected)
23+
int test__powisf2(float a, native_int b, float expected)
2424
{
2525
float x = __powisf2(a, b);
2626
int correct = (x == expected) && (signbit(x) == signbit(expected));
@@ -62,9 +62,9 @@ int main()
6262
return 1;
6363
if (test__powisf2(0, 4, 0))
6464
return 1;
65-
if (test__powisf2(0, 0x7FFFFFFE, 0))
65+
if (test__powisf2(0, INT_MAX -1, 0))
6666
return 1;
67-
if (test__powisf2(0, 0x7FFFFFFF, 0))
67+
if (test__powisf2(0, INT_MAX, 0))
6868
return 1;
6969

7070
if (test__powisf2(-0., 1, -0.))
@@ -75,9 +75,9 @@ int main()
7575
return 1;
7676
if (test__powisf2(-0., 4, 0))
7777
return 1;
78-
if (test__powisf2(-0., 0x7FFFFFFE, 0))
78+
if (test__powisf2(-0., INT_MAX - 1, 0))
7979
return 1;
80-
if (test__powisf2(-0., 0x7FFFFFFF, -0.))
80+
if (test__powisf2(-0., INT_MAX, -0.))
8181
return 1;
8282

8383
if (test__powisf2(1, 1, 1))
@@ -88,9 +88,9 @@ int main()
8888
return 1;
8989
if (test__powisf2(1, 4, 1))
9090
return 1;
91-
if (test__powisf2(1, 0x7FFFFFFE, 1))
91+
if (test__powisf2(1, INT_MAX - 1, 1))
9292
return 1;
93-
if (test__powisf2(1, 0x7FFFFFFF, 1))
93+
if (test__powisf2(1, INT_MAX, 1))
9494
return 1;
9595

9696
if (test__powisf2(INFINITY, 1, INFINITY))
@@ -101,9 +101,9 @@ int main()
101101
return 1;
102102
if (test__powisf2(INFINITY, 4, INFINITY))
103103
return 1;
104-
if (test__powisf2(INFINITY, 0x7FFFFFFE, INFINITY))
104+
if (test__powisf2(INFINITY, INT_MAX - 1, INFINITY))
105105
return 1;
106-
if (test__powisf2(INFINITY, 0x7FFFFFFF, INFINITY))
106+
if (test__powisf2(INFINITY, INT_MAX, INFINITY))
107107
return 1;
108108

109109
if (test__powisf2(-INFINITY, 1, -INFINITY))
@@ -114,9 +114,9 @@ int main()
114114
return 1;
115115
if (test__powisf2(-INFINITY, 4, INFINITY))
116116
return 1;
117-
if (test__powisf2(-INFINITY, 0x7FFFFFFE, INFINITY))
117+
if (test__powisf2(-INFINITY, INT_MAX - 1, INFINITY))
118118
return 1;
119-
if (test__powisf2(-INFINITY, 0x7FFFFFFF, -INFINITY))
119+
if (test__powisf2(-INFINITY, INT_MAX, -INFINITY))
120120
return 1;
121121

122122
if (test__powisf2(0, -1, INFINITY))
@@ -127,11 +127,11 @@ int main()
127127
return 1;
128128
if (test__powisf2(0, -4, INFINITY))
129129
return 1;
130-
if (test__powisf2(0, 0x80000002, INFINITY))
130+
if (test__powisf2(0, INT_MIN + 2, INFINITY))
131131
return 1;
132-
if (test__powisf2(0, 0x80000001, INFINITY))
132+
if (test__powisf2(0, INT_MIN + 1, INFINITY))
133133
return 1;
134-
if (test__powisf2(0, 0x80000000, INFINITY))
134+
if (test__powisf2(0, INT_MIN, INFINITY))
135135
return 1;
136136

137137
if (test__powisf2(-0., -1, -INFINITY))
@@ -142,11 +142,11 @@ int main()
142142
return 1;
143143
if (test__powisf2(-0., -4, INFINITY))
144144
return 1;
145-
if (test__powisf2(-0., 0x80000002, INFINITY))
145+
if (test__powisf2(-0., INT_MIN + 2, INFINITY))
146146
return 1;
147-
if (test__powisf2(-0., 0x80000001, -INFINITY))
147+
if (test__powisf2(-0., INT_MIN + 1, -INFINITY))
148148
return 1;
149-
if (test__powisf2(-0., 0x80000000, INFINITY))
149+
if (test__powisf2(-0., INT_MIN, INFINITY))
150150
return 1;
151151

152152
if (test__powisf2(1, -1, 1))
@@ -157,11 +157,11 @@ int main()
157157
return 1;
158158
if (test__powisf2(1, -4, 1))
159159
return 1;
160-
if (test__powisf2(1, 0x80000002, 1))
160+
if (test__powisf2(1, INT_MIN + 2, 1))
161161
return 1;
162-
if (test__powisf2(1, 0x80000001, 1))
162+
if (test__powisf2(1, INT_MIN + 1, 1))
163163
return 1;
164-
if (test__powisf2(1, 0x80000000, 1))
164+
if (test__powisf2(1, INT_MIN, 1))
165165
return 1;
166166

167167
if (test__powisf2(INFINITY, -1, 0))
@@ -172,11 +172,11 @@ int main()
172172
return 1;
173173
if (test__powisf2(INFINITY, -4, 0))
174174
return 1;
175-
if (test__powisf2(INFINITY, 0x80000002, 0))
175+
if (test__powisf2(INFINITY, INT_MIN + 2, 0))
176176
return 1;
177-
if (test__powisf2(INFINITY, 0x80000001, 0))
177+
if (test__powisf2(INFINITY, INT_MIN + 1, 0))
178178
return 1;
179-
if (test__powisf2(INFINITY, 0x80000000, 0))
179+
if (test__powisf2(INFINITY, INT_MIN, 0))
180180
return 1;
181181

182182
if (test__powisf2(-INFINITY, -1, -0.))
@@ -187,11 +187,11 @@ int main()
187187
return 1;
188188
if (test__powisf2(-INFINITY, -4, 0))
189189
return 1;
190-
if (test__powisf2(-INFINITY, 0x80000002, 0))
190+
if (test__powisf2(-INFINITY, INT_MIN + 2, 0))
191191
return 1;
192-
if (test__powisf2(-INFINITY, 0x80000001, -0.))
192+
if (test__powisf2(-INFINITY, INT_MIN + 1, -0.))
193193
return 1;
194-
if (test__powisf2(-INFINITY, 0x80000000, 0))
194+
if (test__powisf2(-INFINITY, INT_MIN, 0))
195195
return 1;
196196

197197
if (test__powisf2(2, 10, 1024.))

0 commit comments

Comments
 (0)