bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

bigint: cfg(target_arch = ...) => cfg(target_word_size = ...)

Browse source
This commit is contained in:
gifnksm 2013-08-25 22:18:24 +09:00
parent 6a649e6b8b
commit 36d698d544
1 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/libextra/num/bigint.rs
View file

@ -32,9 +32,7 @@ A BigDigit is a BigUint's composing element.
A BigDigit is half the size of machine word size. A BigDigit is half the size of machine word size.
*/ */
#[cfg(target_arch = "x86")] #[cfg(target_word_size = "32")]
#[cfg(target_arch = "arm")]
#[cfg(target_arch = "mips")]
pub type BigDigit = u16; pub type BigDigit = u16;
/** /**
@ -42,7 +40,7 @@ A BigDigit is a BigUint's composing element.
A BigDigit is half the size of machine word size. A BigDigit is half the size of machine word size.
*/ */
#[cfg(target_arch = "x86_64")] #[cfg(target_word_size = "64")]
pub type BigDigit = u32; pub type BigDigit = u32;
pub static ZERO_BIG_DIGIT: BigDigit = 0; pub static ZERO_BIG_DIGIT: BigDigit = 0;
@ -50,12 +48,10 @@ pub static ZERO_BIG_DIGIT: BigDigit = 0;
pub mod BigDigit { pub mod BigDigit {
use bigint::BigDigit; use bigint::BigDigit;
#[cfg(target_arch = "x86")] #[cfg(target_word_size = "32")]
#[cfg(target_arch = "arm")]
#[cfg(target_arch = "mips")]
pub static bits: uint = 16; pub static bits: uint = 16;
#[cfg(target_arch = "x86_64")] #[cfg(target_word_size = "64")]
pub static bits: uint = 32; pub static bits: uint = 32;
pub static base: uint = 1 << bits; pub static base: uint = 1 << bits;
@ -659,8 +655,7 @@ impl BigUint {
} }
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_word_size = "64")]
fn get_radix_base(radix: uint) -> (uint, uint) { fn get_radix_base(radix: uint) -> (uint, uint) {
assert!(1 < radix && radix <= 16); assert!(1 < radix && radix <= 16);
match radix { match radix {
@ -683,10 +678,7 @@ fn get_radix_base(radix: uint) -> (uint, uint) {
} }
} }
#[cfg(target_arch = "arm")] #[cfg(target_word_size = "32")]
#[cfg(target_arch = "x86")]
#[cfg(target_arch = "mips")]
fn get_radix_base(radix: uint) -> (uint, uint) { fn get_radix_base(radix: uint) -> (uint, uint) {
assert!(1 < radix && radix <= 16); assert!(1 < radix && radix <= 16);
match radix { match radix {
@ -1233,7 +1225,7 @@ mod biguint_tests {
test_shl_bits(); test_shl_bits();
#[cfg(target_arch = "x86_64")] #[cfg(target_word_size = "64")]
fn test_shl_bits() { fn test_shl_bits() {
check(~[0x7654_3210, 0xfedc_ba98, check(~[0x7654_3210, 0xfedc_ba98,
0x7654_3210, 0xfedc_ba98], 4, 0x7654_3210, 0xfedc_ba98], 4,
@ -1245,9 +1237,7 @@ mod biguint_tests {
0x5555_4444, 0x7777_6666, 0x8888]); 0x5555_4444, 0x7777_6666, 0x8888]);
} }
#[cfg(target_arch = "arm")] #[cfg(target_word_size = "32")]
#[cfg(target_arch = "x86")]
#[cfg(target_arch = "mips")]
fn test_shl_bits() { fn test_shl_bits() {
check(~[0x3210, 0x7654, 0xba98, 0xfedc, check(~[0x3210, 0x7654, 0xba98, 0xfedc,
0x3210, 0x7654, 0xba98, 0xfedc], 4, 0x3210, 0x7654, 0xba98, 0xfedc], 4,
@ -1262,9 +1252,7 @@ mod biguint_tests {
} }
#[test] #[test]
#[ignore(cfg(target_arch = "x86"))] #[ignore(cfg(target_word_size = "32"))]
#[ignore(cfg(target_arch = "arm"))]
#[ignore(cfg(target_arch = "mips"))]
fn test_shr() { fn test_shr() {
fn check(v: ~[BigDigit], shift: uint, ans: ~[BigDigit]) { fn check(v: ~[BigDigit], shift: uint, ans: ~[BigDigit]) {
assert_eq!(BigUint::new(v) >> shift, BigUint::new(ans)); assert_eq!(BigUint::new(v) >> shift, BigUint::new(ans));
@ -1279,7 +1267,7 @@ mod biguint_tests {
check(~[0, 1], 1, ~[0x80000000]); check(~[0, 1], 1, ~[0x80000000]);
test_shr_bits(); test_shr_bits();
#[cfg(target_arch = "x86_64")] #[cfg(target_word_size = "64")]
fn test_shr_bits() { fn test_shr_bits() {
check(~[0x6543_2100, 0xedcb_a987, check(~[0x6543_2100, 0xedcb_a987,
0x6543_210f, 0xedcb_a987, 0xf], 4, 0x6543_210f, 0xedcb_a987, 0xf], 4,
@ -1291,9 +1279,7 @@ mod biguint_tests {
0x6666_5555, 0x8888_7777]); 0x6666_5555, 0x8888_7777]);
} }
#[cfg(target_arch = "arm")] #[cfg(target_word_size = "32")]
#[cfg(target_arch = "x86")]
#[cfg(target_arch = "mips")]
fn test_shr_bits() { fn test_shr_bits() {
check(~[0x2100, 0x6543, 0xa987, 0xedcb, check(~[0x2100, 0x6543, 0xa987, 0xedcb,
0x210f, 0x6543, 0xa987, 0xedcb, 0xf], 4, 0x210f, 0x6543, 0xa987, 0xedcb, 0xf], 4,