grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1258 from ethcore/uint-fix

Browse Source 
Fixing uint ASM macros compilation
This commit is contained in:
Arkadiy Paronyan 2016-06-13 11:57:01 +02:00 committed by GitHub
commit b1849bd1ad
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
util/bigint/src/uint.rs
View File

@ -91,9 +91,9 @@ macro_rules! uint_overflowing_add_reg {
#[cfg(all(asm_available, target_arch="x86_64"))] #[cfg(all(asm_available, target_arch="x86_64"))]
macro_rules! uint_overflowing_add { macro_rules! uint_overflowing_add {
(U256, $n_words: expr, $self_expr: expr, $other: expr) => ({ (U256, $n_words: expr, $self_expr: expr, $other: expr) => ({
let mut result: [u64; 4] = unsafe { mem::uninitialized() }; let mut result: [u64; $n_words] = unsafe { mem::uninitialized() };
let self_t: &[u64; 4] = &self.0; let self_t: &[u64; $n_words] = &$self_expr.0;
let other_t: &[u64; 4] = &other.0; let other_t: &[u64; $n_words] = &$other.0;
let overflow: u8; let overflow: u8;
unsafe { unsafe {
@ -114,9 +114,9 @@ macro_rules! uint_overflowing_add {
(U256(result), overflow != 0) (U256(result), overflow != 0)
}); });
(U512, $n_words: expr, $self_expr: expr, $other: expr) => ({ (U512, $n_words: expr, $self_expr: expr, $other: expr) => ({
let mut result: [u64; 8] = unsafe { mem::uninitialized() }; let mut result: [u64; $n_words] = unsafe { mem::uninitialized() };
let self_t: &[u64; 8] = &self.0; let self_t: &[u64; $n_words] = &$self_expr.0;
let other_t: &[u64; 8] = &other.0; let other_t: &[u64; $n_words] = &$other.0;
let overflow: u8; let overflow: u8;
@ -195,9 +195,9 @@ macro_rules! uint_overflowing_sub_reg {
#[cfg(all(asm_available, target_arch="x86_64"))] #[cfg(all(asm_available, target_arch="x86_64"))]
macro_rules! uint_overflowing_sub { macro_rules! uint_overflowing_sub {
(U256, $n_words: expr, $self_expr: expr, $other: expr) => ({ (U256, $n_words: expr, $self_expr: expr, $other: expr) => ({
let mut result: [u64; 4] = unsafe { mem::uninitialized() }; let mut result: [u64; $n_words] = unsafe { mem::uninitialized() };
let self_t: &[u64; 4] = &self.0; let self_t: &[u64; $n_words] = &$self_expr.0;
let other_t: &[u64; 4] = &other.0; let other_t: &[u64; $n_words] = &$other.0;
let overflow: u8; let overflow: u8;
unsafe { unsafe {
@ -217,9 +217,9 @@ macro_rules! uint_overflowing_sub {
(U256(result), overflow != 0) (U256(result), overflow != 0)
}); });
(U512, $n_words: expr, $self_expr: expr, $other: expr) => ({ (U512, $n_words: expr, $self_expr: expr, $other: expr) => ({
let mut result: [u64; 8] = unsafe { mem::uninitialized() }; let mut result: [u64; $n_words] = unsafe { mem::uninitialized() };
let self_t: &[u64; 8] = &self.0; let self_t: &[u64; $n_words] = &$self_expr.0;
let other_t: &[u64; 8] = &other.0; let other_t: &[u64; $n_words] = &$other.0;
let overflow: u8; let overflow: u8;
@ -269,9 +269,9 @@ macro_rules! uint_overflowing_sub {
#[cfg(all(asm_available, target_arch="x86_64"))] #[cfg(all(asm_available, target_arch="x86_64"))]
macro_rules! uint_overflowing_mul { macro_rules! uint_overflowing_mul {
(U256, $n_words: expr, $self_expr: expr, $other: expr) => ({ (U256, $n_words: expr, $self_expr: expr, $other: expr) => ({
let mut result: [u64; 4] = unsafe { mem::uninitialized() }; let mut result: [u64; $n_words] = unsafe { mem::uninitialized() };
let self_t: &[u64; 4] = &self.0; let self_t: &[u64; $n_words] = &$self_expr.0;
let other_t: &[u64; 4] = &self.0; let other_t: &[u64; $n_words] = &$other.0;
let overflow: u64; let overflow: u64;
unsafe { unsafe {