-
Notifications
You must be signed in to change notification settings - Fork 45
/
libcore_nofp.patch
322 lines (276 loc) · 9.82 KB
/
libcore_nofp.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
Only in libcore/: clone.rs.orig
Only in libcore/: clone.rs.rej
diff -rub libcore_orig/default.rs libcore/default.rs
--- libcore_orig/default.rs 2017-11-11 10:43:12.134174979 +0800
+++ libcore/default.rs 2017-11-11 10:40:42.210064028 +0800
@@ -154,5 +154,7 @@
default_impl! { i64, 0, "Returns the default value of `0`" }
default_impl! { i128, 0, "Returns the default value of `0`" }
+#[cfg(not(disable_float))]
default_impl! { f32, 0.0f32, "Returns the default value of `0.0`" }
+#[cfg(not(disable_float))]
default_impl! { f64, 0.0f64, "Returns the default value of `0.0`" }
Only in libcore/: default.rs.orig
Only in libcore/: default.rs.rej
diff -rub libcore_orig/fmt/mod.rs libcore/fmt/mod.rs
--- libcore_orig/fmt/mod.rs 2017-11-11 10:43:11.866148987 +0800
+++ libcore/fmt/mod.rs 2017-11-11 10:40:42.210064028 +0800
@@ -15,12 +15,14 @@
use cell::{UnsafeCell, Cell, RefCell, Ref, RefMut};
use marker::PhantomData;
use mem;
+#[cfg(not(disable_float))]
use num::flt2dec;
use ops::Deref;
use result;
use slice;
use str;
+#[cfg(not(disable_float))]
mod float;
mod num;
mod builders;
@@ -1205,6 +1207,7 @@
/// Takes the formatted parts and applies the padding.
/// Assumes that the caller already has rendered the parts with required precision,
/// so that `self.precision` can be ignored.
+ #[cfg(not(disable_float))]
fn pad_formatted_parts(&mut self, formatted: &flt2dec::Formatted) -> Result {
if let Some(mut width) = self.width {
// for the sign-aware zero padding, we render the sign first and
@@ -1244,6 +1247,7 @@
}
}
+ #[cfg(not(disable_float))]
fn write_formatted_parts(&mut self, formatted: &flt2dec::Formatted) -> Result {
fn write_bytes(buf: &mut Write, s: &[u8]) -> Result {
buf.write_str(unsafe { str::from_utf8_unchecked(s) })
Only in libcore/fmt: mod.rs.orig
diff -rub libcore_orig/intrinsics.rs libcore/intrinsics.rs
--- libcore_orig/intrinsics.rs 2017-11-11 10:43:12.062168001 +0800
+++ libcore/intrinsics.rs 2017-11-11 10:40:42.214064504 +0800
@@ -1081,7 +1081,10 @@
/// The stabilized version of this intrinsic is
/// [`std::ptr::write_volatile`](../../std/ptr/fn.write_volatile.html).
pub fn volatile_store<T>(dst: *mut T, val: T);
+}
+#[cfg(not(disable_float))]
+extern "rust-intrinsic" {
/// Returns the square root of an `f32`
pub fn sqrtf32(x: f32) -> f32;
/// Returns the square root of an `f64`
@@ -1198,8 +1201,9 @@
/// Float remainder that allows optimizations based on algebraic rules.
/// May assume inputs are finite.
pub fn frem_fast<T>(a: T, b: T) -> T;
+}
-
+extern "rust-intrinsic" {
/// Returns the number of bits set in an integer type `T`
pub fn ctpop<T>(x: T) -> T;
Only in libcore/: intrinsics.rs.orig
diff -rub libcore_orig/iter/traits.rs libcore/iter/traits.rs
--- libcore_orig/iter/traits.rs 2017-11-11 10:43:12.110172653 +0800
+++ libcore/iter/traits.rs 2017-11-11 10:40:42.214064504 +0800
@@ -764,6 +764,7 @@
);
}
+#[cfg(not(disable_float))]
macro_rules! float_sum_product {
($($a:ident)*) => ($(
#[stable(feature = "iter_arith_traits", since = "1.12.0")]
@@ -797,6 +798,7 @@
}
integer_sum_product! { i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize }
+#[cfg(not(disable_float))]
float_sum_product! { f32 f64 }
/// An iterator adapter that produces output as long as the underlying
Only in libcore/iter: traits.rs.orig
Only in libcore/iter: traits.rs.rej
diff -rub libcore_orig/lib.rs libcore/lib.rs
--- libcore_orig/lib.rs 2017-11-11 10:43:11.790141612 +0800
+++ libcore/lib.rs 2017-11-11 10:40:42.214064504 +0800
@@ -140,7 +140,9 @@
#[path = "num/u64.rs"] pub mod u64;
#[path = "num/u128.rs"] pub mod u128;
+#[cfg(not(disable_float))]
#[path = "num/f32.rs"] pub mod f32;
+#[cfg(not(disable_float))]
#[path = "num/f64.rs"] pub mod f64;
#[macro_use]
Only in libcore/: lib.rs.orig
diff -rub libcore_orig/num/flt2dec/decoder.rs libcore/num/flt2dec/decoder.rs
--- libcore_orig/num/flt2dec/decoder.rs 2017-11-11 10:43:12.026164512 +0800
+++ libcore/num/flt2dec/decoder.rs 2017-11-11 10:40:42.214064504 +0800
@@ -10,6 +10,7 @@
//! Decodes a floating-point value into individual parts and error ranges.
+#[cfg(not(disable_float))]
use {f32, f64};
use num::FpCategory;
use num::dec2flt::rawfp::RawFloat;
@@ -56,10 +57,12 @@
fn min_pos_norm_value() -> Self;
}
+#[cfg(not(disable_float))]
impl DecodableFloat for f32 {
fn min_pos_norm_value() -> Self { f32::MIN_POSITIVE }
}
+#[cfg(not(disable_float))]
impl DecodableFloat for f64 {
fn min_pos_norm_value() -> Self { f64::MIN_POSITIVE }
}
diff -rub libcore_orig/num/mod.rs libcore/num/mod.rs
--- libcore_orig/num/mod.rs 2017-11-11 10:43:11.850147435 +0800
+++ libcore/num/mod.rs 2017-11-11 10:42:40.419034954 +0800
@@ -91,7 +91,9 @@
mod wrapping;
// All these modules are technically private and only exposed for coretests:
+#[cfg(not(disable_float))]
pub mod flt2dec;
+#[cfg(not(disable_float))]
pub mod dec2flt;
pub mod bignum;
pub mod diy_float;
@@ -2950,6 +2952,7 @@
#[unstable(feature = "core_float",
reason = "stable interface is via `impl f{32,64}` in later crates",
issue = "32110")]
+#[cfg(not(disable_float))]
pub trait Float: Sized {
/// Returns `true` if this value is NaN and false otherwise.
#[stable(feature = "core", since = "1.6.0")]
@@ -3394,6 +3397,7 @@
}
#[stable(feature = "rust1", since = "1.0.0")]
+#[cfg(not(disable_float))]
pub use num::dec2flt::ParseFloatError;
// Conversion traits for primitive integer and float types
@@ -3453,6 +3457,9 @@
// they fit in the significand, which is 24 bits in f32 and 53 bits in f64.
// Lossy float conversions are not implemented at this time.
+#[cfg(not(disable_float))]
+mod _int_flot_conv {
+use convert::From;
// Signed -> Float
impl_from! { i8, f32, #[stable(feature = "lossless_float_conv", since = "1.6.0")] }
impl_from! { i8, f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")] }
@@ -3469,6 +3476,7 @@
// Float -> Float
impl_from! { f32, f64, #[stable(feature = "lossless_float_conv", since = "1.6.0")] }
+}
static ASCII_LOWERCASE_MAP: [u8; 256] = [
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
Only in libcore/num: mod.rs.orig
Only in libcore/num: .mod.rs.orig.swp
Only in libcore/num: mod.rs.rej
Only in libcore/num: .mod.rs.rej.swp
Only in libcore/num: .mod.rs.swp
diff -rub libcore_orig/ops/arith.rs libcore/ops/arith.rs
--- libcore_orig/ops/arith.rs 2017-11-11 10:43:11.950157139 +0800
+++ libcore/ops/arith.rs 2017-11-11 10:40:42.218064980 +0800
@@ -101,7 +101,9 @@
)*)
}
-add_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
+add_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+add_impl! { f32 f64 }
/// The subtraction operator `-`.
///
@@ -196,7 +198,9 @@
)*)
}
-sub_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
+sub_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+sub_impl! { f32 f64 }
/// The multiplication operator `*`.
///
@@ -313,7 +317,9 @@
)*)
}
-mul_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
+mul_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+mul_impl! { f32 f64 }
/// The division operator `/`.
///
@@ -437,6 +443,7 @@
div_impl_integer! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
macro_rules! div_impl_float {
($($t:ty)*) => ($(
#[stable(feature = "rust1", since = "1.0.0")]
@@ -451,6 +458,7 @@
)*)
}
+#[cfg(not(disable_float))]
div_impl_float! { f32 f64 }
/// The remainder operator `%`.
@@ -520,6 +528,7 @@
rem_impl_integer! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
macro_rules! rem_impl_float {
($($t:ty)*) => ($(
#[stable(feature = "rust1", since = "1.0.0")]
@@ -534,6 +543,7 @@
)*)
}
+#[cfg(not(disable_float))]
rem_impl_float! { f32 f64 }
/// The unary negation operator `-`.
@@ -614,7 +624,9 @@
}
// neg_impl_unsigned! { usize u8 u16 u32 u64 }
-neg_impl_numeric! { isize i8 i16 i32 i64 i128 f32 f64 }
+neg_impl_numeric! { isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+neg_impl_numeric! { f32 f64 }
/// The addition assignment operator `+=`.
///
@@ -667,7 +679,9 @@
)+)
}
-add_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
+add_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+add_assign_impl! { f32 f64 }
/// The subtraction assignment operator `-=`.
///
@@ -720,7 +734,9 @@
)+)
}
-sub_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
+sub_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+sub_assign_impl! { f32 f64 }
/// The multiplication assignment operator `*=`.
///
@@ -764,7 +780,9 @@
)+)
}
-mul_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
+mul_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+mul_assign_impl! { f32 f64 }
/// The division assignment operator `/=`.
///
@@ -807,7 +825,9 @@
)+)
}
-div_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
+div_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+div_assign_impl! { f32 f64 }
/// The remainder assignment operator `%=`.
///
@@ -854,4 +874,6 @@
)+)
}
-rem_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
+rem_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
+#[cfg(not(disable_float))]
+rem_assign_impl! { f32 f64 }
Only in libcore/ops: arith.rs.orig
Only in libcore/ops: arith.rs.rej
Only in libcore_orig/: ops.rs
Only in libcore_orig/: ops.rs.rej