Skip to content

Commit 89a2741

Browse files
osiewiczosiewicz
committed
Revert "Remove limb_width32 and limb_width64 features"
This reverts commit c754f03.
1 parent 16e04ce commit 89a2741

File tree

5 files changed

+73
-75
lines changed

5 files changed

+73
-75
lines changed

‎build.rs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
use std::env;
2+
use std::process::Command;
3+
use std::str::{self, FromStr};
4+
5+
fn main() {
6+
println!("cargo:rerun-if-changed=build.rs");
7+
8+
// Decide ideal limb width for arithmetic in the float parser. Refer to
9+
// src/lexical/math.rs for where this has an effect.
10+
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
11+
match target_arch.as_str() {
12+
"aarch64" | "mips64" | "powerpc64" | "x86_64" => {
13+
println!("cargo:rustc-cfg=limb_width_64");
14+
}
15+
_ => {
16+
println!("cargo:rustc-cfg=limb_width_32");
17+
}
18+
}
19+
20+
let minor = match rustc_minor_version() {
21+
Some(minor) => minor,
22+
None => return,
23+
};
24+
}
25+
26+
fn rustc_minor_version() -> Option<u32> {
27+
let rustc = env::var_os("RUSTC")?;
28+
let output = Command::new(rustc).arg("--version").output().ok()?;
29+
let version = str::from_utf8(&output.stdout).ok()?;
30+
let mut pieces = version.split('.');
31+
if pieces.next() != Some("rustc 1") {
32+
return None;
33+
}
34+
let next = pieces.next()?;
35+
u32::from_str(next).ok()
36+
}

‎src/lexical/math.rs

+25-61
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//! buffers, so for a `vec![0, 1, 2, 3]`, `3` is the most significant limb,
77
//! and `0` is the least significant limb.
88
9+
use super::large_powers;
910
use super::num::*;
1011
use super::small_powers::*;
1112
use alloc::vec::Vec;
@@ -35,58 +36,31 @@ use core::{cmp, iter, mem};
3536
// requiring software emulation.
3637
// sparc64 (`UMUL` only supported double-word arguments).
3738

38-
#[doc(hidden)]
39-
pub trait LimbConfig {
40-
type Limb: 'static;
41-
type Wide: 'static;
42-
const POW5_LIMB: &'static [Self::Limb];
43-
const POW10_LIMB: &'static [Self::Limb];
44-
const LARGE_POWERS: &'static [&'static [Self::Limb]];
45-
}
46-
4739
// 32-BIT LIMB
48-
#[doc(hidden)]
49-
pub struct LimbConfig32;
50-
51-
impl LimbConfig for LimbConfig32 {
52-
type Limb = u32;
53-
type Wide = u64;
54-
const POW5_LIMB: &'static [Self::Limb] = &POW5_32;
55-
const POW10_LIMB: &'static [Self::Limb] = &POW10_32;
56-
const LARGE_POWERS: &'static [&'static [Self::Limb]] = &super::large_powers32::POW5;
57-
}
40+
#[cfg(limb_width_32)]
41+
pub type Limb = u32;
42+
43+
#[cfg(limb_width_32)]
44+
pub const POW5_LIMB: &[Limb] = &POW5_32;
45+
46+
#[cfg(limb_width_32)]
47+
pub const POW10_LIMB: &[Limb] = &POW10_32;
48+
49+
#[cfg(limb_width_32)]
50+
type Wide = u64;
5851

5952
// 64-BIT LIMB
60-
#[doc(hidden)]
61-
pub struct LimbConfig64;
62-
impl LimbConfig for LimbConfig64 {
63-
type Limb = u64;
64-
type Wide = u128;
65-
const POW5_LIMB: &'static [Self::Limb] = &POW5_64;
66-
const POW10_LIMB: &'static [Self::Limb] = &POW10_64;
67-
const LARGE_POWERS: &'static [&'static [Self::Limb]] = &super::large_powers64::POW5;
68-
}
53+
#[cfg(limb_width_64)]
54+
pub type Limb = u64;
55+
56+
#[cfg(limb_width_64)]
57+
pub const POW5_LIMB: &[Limb] = &POW5_64;
58+
59+
#[cfg(limb_width_64)]
60+
pub const POW10_LIMB: &[Limb] = &POW10_64;
6961

70-
#[cfg(any(
71-
target_arch = "aarch64",
72-
target_arch = "mips64",
73-
target_arch = "powerpc64",
74-
target_arch = "x86_64"
75-
))]
76-
type PlatformLimbConfig = LimbConfig64;
77-
#[cfg(not(any(
78-
target_arch = "aarch64",
79-
target_arch = "mips64",
80-
target_arch = "powerpc64",
81-
target_arch = "x86_64"
82-
)))]
83-
type PlatformLimbConfig = LimbConfig32;
84-
85-
pub type Limb = <PlatformLimbConfig as LimbConfig>::Limb;
86-
type Wide = <PlatformLimbConfig as LimbConfig>::Wide;
87-
pub const POW5_LIMB: &[Limb] = PlatformLimbConfig::POW5_LIMB;
88-
pub const POW10_LIMB: &[Limb] = PlatformLimbConfig::POW10_LIMB;
89-
const LARGE_POWERS: &'static [&'static [Limb]] = PlatformLimbConfig::LARGE_POWERS;
62+
#[cfg(limb_width_64)]
63+
type Wide = u128;
9064

9165
/// Cast to limb type.
9266
#[inline]
@@ -105,24 +79,14 @@ fn as_wide<T: Integer>(t: T) -> Wide {
10579

10680
/// Split u64 into limbs, in little-endian order.
10781
#[inline]
108-
#[cfg(not(any(
109-
target_arch = "aarch64",
110-
target_arch = "mips64",
111-
target_arch = "powerpc64",
112-
target_arch = "x86_64"
113-
)))]
82+
#[cfg(limb_width_32)]
11483
fn split_u64(x: u64) -> [Limb; 2] {
11584
[as_limb(x), as_limb(x >> 32)]
11685
}
11786

11887
/// Split u64 into limbs, in little-endian order.
11988
#[inline]
120-
#[cfg(any(
121-
target_arch = "aarch64",
122-
target_arch = "mips64",
123-
target_arch = "powerpc64",
124-
target_arch = "x86_64"
125-
))]
89+
#[cfg(limb_width_64)]
12690
fn split_u64(x: u64) -> [Limb; 1] {
12791
[as_limb(x)]
12892
}
@@ -427,7 +391,7 @@ mod small {
427391
use super::large::KARATSUBA_CUTOFF;
428392

429393
let small_powers = POW5_LIMB;
430-
let large_powers = LARGE_POWERS;
394+
let large_powers = large_powers::POW5;
431395

432396
if n == 0 {
433397
// No exponent, just return.

‎src/lexical/mod.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,19 @@ mod digit;
2020
mod errors;
2121
pub(crate) mod exponent;
2222
pub(crate) mod float;
23-
mod large_powers32;
24-
mod large_powers64;
23+
mod large_powers;
2524
pub(crate) mod math;
2625
pub(crate) mod num;
2726
pub(crate) mod parse;
2827
pub(crate) mod rounding;
2928
mod shift;
3029
mod small_powers;
3130

31+
#[cfg(limb_width_32)]
32+
mod large_powers32;
33+
34+
#[cfg(limb_width_64)]
35+
mod large_powers64;
36+
3237
// API
3338
pub use self::parse::{parse_concise_float, parse_truncated_float};

‎src/lexical/small_powers.rs

+3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
//! Pre-computed small powers.
44
55
// 32 BIT
6+
#[cfg(limb_width_32)]
67
pub(crate) const POW5_32: [u32; 14] = [
78
1, 5, 25, 125, 625, 3125, 15625, 78125, 390625, 1953125, 9765625, 48828125, 244140625,
89
1220703125,
910
];
1011

12+
#[cfg(limb_width_32)]
1113
pub(crate) const POW10_32: [u32; 10] = [
1214
1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000,
1315
];
1416

1517
// 64 BIT
18+
#[cfg(limb_width_64)]
1619
pub(crate) const POW5_64: [u64; 28] = [
1720
1,
1821
5,

‎tests/lexical/math.rs

+2-12
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,12 @@ impl Math for Bigint {
1818
}
1919
}
2020

21-
#[cfg(not(any(
22-
target_arch = "aarch64",
23-
target_arch = "mips64",
24-
target_arch = "powerpc64",
25-
target_arch = "x86_64"
26-
)))]
21+
#[cfg(limb_width_32)]
2722
pub(crate) fn from_u32(x: &[u32]) -> Vec<Limb> {
2823
x.iter().cloned().collect()
2924
}
3025

31-
#[cfg(any(
32-
target_arch = "aarch64",
33-
target_arch = "mips64",
34-
target_arch = "powerpc64",
35-
target_arch = "x86_64"
36-
))]
26+
#[cfg(limb_width_64)]
3727
pub(crate) fn from_u32(x: &[u32]) -> Vec<Limb> {
3828
let mut v = Vec::<Limb>::default();
3929
for xi in x.chunks(2) {

0 commit comments

Comments
 (0)