From 1749d611254a4ae8992daa591fc5e60e652028fa Mon Sep 17 00:00:00 2001 From: Carl-Anton Ingmarsson Date: Thu, 2 Jan 2014 23:22:07 +0100 Subject: [PATCH] libstd: Always inline all byteswap functions --- src/libstd/unstable/intrinsics.rs | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index e0089b599c5b..bc88abaae973 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -486,33 +486,33 @@ extern "rust-intrinsic" { pub fn u64_mul_with_overflow(x: u64, y: u64) -> (u64, bool); } -#[cfg(target_endian = "little")] pub fn to_le16(x: i16) -> i16 { x } -#[cfg(target_endian = "big")] pub fn to_le16(x: i16) -> i16 { unsafe { bswap16(x) } } -#[cfg(target_endian = "little")] pub fn to_le32(x: i32) -> i32 { x } -#[cfg(target_endian = "big")] pub fn to_le32(x: i32) -> i32 { unsafe { bswap32(x) } } -#[cfg(target_endian = "little")] pub fn to_le64(x: i64) -> i64 { x } -#[cfg(target_endian = "big")] pub fn to_le64(x: i64) -> i64 { unsafe { bswap64(x) } } +#[cfg(target_endian = "little")] #[inline(always)] pub fn to_le16(x: i16) -> i16 { x } +#[cfg(target_endian = "big")] #[inline(always)] pub fn to_le16(x: i16) -> i16 { unsafe { bswap16(x) } } +#[cfg(target_endian = "little")] #[inline(always)] pub fn to_le32(x: i32) -> i32 { x } +#[cfg(target_endian = "big")] #[inline(always)] pub fn to_le32(x: i32) -> i32 { unsafe { bswap32(x) } } +#[cfg(target_endian = "little")] #[inline(always)] pub fn to_le64(x: i64) -> i64 { x } +#[cfg(target_endian = "big")] #[inline(always)] pub fn to_le64(x: i64) -> i64 { unsafe { bswap64(x) } } -#[cfg(target_endian = "little")] pub fn to_be16(x: i16) -> i16 { unsafe { bswap16(x) } } -#[cfg(target_endian = "big")] pub fn to_be16(x: i16) -> i16 { x } -#[cfg(target_endian = "little")] pub fn to_be32(x: i32) -> i32 { unsafe { bswap32(x) } } -#[cfg(target_endian = "big")] pub fn to_be32(x: i32) -> i32 { x } -#[cfg(target_endian = "little")] pub fn to_be64(x: i64) -> i64 { unsafe { bswap64(x) } } -#[cfg(target_endian = "big")] pub fn to_be64(x: i64) -> i64 { x } +#[cfg(target_endian = "little")] #[inline(always)] pub fn to_be16(x: i16) -> i16 { unsafe { bswap16(x) } } +#[cfg(target_endian = "big")] #[inline(always)] pub fn to_be16(x: i16) -> i16 { x } +#[cfg(target_endian = "little")] #[inline(always)] pub fn to_be32(x: i32) -> i32 { unsafe { bswap32(x) } } +#[cfg(target_endian = "big")] #[inline(always)] pub fn to_be32(x: i32) -> i32 { x } +#[cfg(target_endian = "little")] #[inline(always)] pub fn to_be64(x: i64) -> i64 { unsafe { bswap64(x) } } +#[cfg(target_endian = "big")] #[inline(always)] pub fn to_be64(x: i64) -> i64 { x } -#[cfg(target_endian = "little")] pub fn from_le16(x: i16) -> i16 { x } -#[cfg(target_endian = "big")] pub fn from_le16(x: i16) -> i16 { unsafe { bswap16(x) } } -#[cfg(target_endian = "little")] pub fn from_le32(x: i32) -> i32 { x } -#[cfg(target_endian = "big")] pub fn from_le32(x: i32) -> i32 { unsafe { bswap32(x) } } -#[cfg(target_endian = "little")] pub fn from_le64(x: i64) -> i64 { x } -#[cfg(target_endian = "big")] pub fn from_le64(x: i64) -> i64 { unsafe { bswap64(x) } } +#[cfg(target_endian = "little")] #[inline(always)] pub fn from_le16(x: i16) -> i16 { x } +#[cfg(target_endian = "big")] #[inline(always)] pub fn from_le16(x: i16) -> i16 { unsafe { bswap16(x) } } +#[cfg(target_endian = "little")] #[inline(always)] pub fn from_le32(x: i32) -> i32 { x } +#[cfg(target_endian = "big")] #[inline(always)] pub fn from_le32(x: i32) -> i32 { unsafe { bswap32(x) } } +#[cfg(target_endian = "little")] #[inline(always)] pub fn from_le64(x: i64) -> i64 { x } +#[cfg(target_endian = "big")] #[inline(always)] pub fn from_le64(x: i64) -> i64 { unsafe { bswap64(x) } } -#[cfg(target_endian = "little")] pub fn from_be16(x: i16) -> i16 { unsafe { bswap16(x) } } -#[cfg(target_endian = "big")] pub fn from_be16(x: i16) -> i16 { x } -#[cfg(target_endian = "little")] pub fn from_be32(x: i32) -> i32 { unsafe { bswap32(x) } } -#[cfg(target_endian = "big")] pub fn from_be32(x: i32) -> i32 { x } -#[cfg(target_endian = "little")] pub fn from_be64(x: i64) -> i64 { unsafe { bswap64(x) } } -#[cfg(target_endian = "big")] pub fn from_be64(x: i64) -> i64 { x } +#[cfg(target_endian = "little")] #[inline(always)] pub fn from_be16(x: i16) -> i16 { unsafe { bswap16(x) } } +#[cfg(target_endian = "big")] #[inline(always)] pub fn from_be16(x: i16) -> i16 { x } +#[cfg(target_endian = "little")] #[inline(always)] pub fn from_be32(x: i32) -> i32 { unsafe { bswap32(x) } } +#[cfg(target_endian = "big")] #[inline(always)] pub fn from_be32(x: i32) -> i32 { x } +#[cfg(target_endian = "little")] #[inline(always)] pub fn from_be64(x: i64) -> i64 { unsafe { bswap64(x) } } +#[cfg(target_endian = "big")] #[inline(always)] pub fn from_be64(x: i64) -> i64 { x } /// `TypeId` represents a globally unique identifier for a type #[lang="type_id"] // This needs to be kept in lockstep with the code in trans/intrinsic.rs and