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

Remove a couple of unnecessary transmute() (#8736)

Browse Source
This commit is contained in:
Niklas Adolfsson 2018-05-31 13:39:25 +02:00 committed by Afri Schoedon
parent 118588ef6c
commit 1020560af6
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethash/src/compute.rs
View File

@ -25,9 +25,8 @@ use seed_compute::SeedHashCompute;
use shared::*; use shared::*;
use std::io; use std::io;
use std::mem; use std::{mem, ptr};
use std::path::Path; use std::path::Path;
use std::ptr;
const MIX_WORDS: usize = ETHASH_MIX_BYTES / 4; const MIX_WORDS: usize = ETHASH_MIX_BYTES / 4;
const MIX_NODES: usize = MIX_WORDS / NODE_WORDS; const MIX_NODES: usize = MIX_WORDS / NODE_WORDS;
@ -111,7 +110,7 @@ pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256) ->
let mut buf: [u8; 64 + 32] = mem::uninitialized(); let mut buf: [u8; 64 + 32] = mem::uninitialized();
ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32); ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32);
ptr::copy_nonoverlapping(mem::transmute(&nonce), buf[32..].as_mut_ptr(), 8); ptr::copy_nonoverlapping(&nonce as *const u64 as *const u8, buf[32..].as_mut_ptr(), 8);
keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40); keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32); ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);

11
util/plain_hasher/src/lib.rs
View File

@ -2,9 +2,9 @@
extern crate crunchy; extern crate crunchy;
extern crate ethereum_types; extern crate ethereum_types;
use std::{hash, mem};
use std::collections::{HashMap, HashSet};
use ethereum_types::H256; use ethereum_types::H256;
use std::collections::{HashMap, HashSet};
use std::hash;
/// Specialized version of `HashMap` with H256 keys and fast hashing function. /// Specialized version of `HashMap` with H256 keys and fast hashing function.
pub type H256FastMap<T> = HashMap<H256, T, hash::BuildHasherDefault<PlainHasher>>; pub type H256FastMap<T> = HashMap<H256, T, hash::BuildHasherDefault<PlainHasher>>;
@ -28,16 +28,13 @@ impl hash::Hasher for PlainHasher {
#[allow(unused_assignments)] #[allow(unused_assignments)]
fn write(&mut self, bytes: &[u8]) { fn write(&mut self, bytes: &[u8]) {
debug_assert!(bytes.len() == 32); debug_assert!(bytes.len() == 32);
unsafe {
let mut bytes_ptr = bytes.as_ptr(); let mut bytes_ptr = bytes.as_ptr();
let prefix_u8: &mut [u8; 8] = mem::transmute(&mut self.prefix); let mut prefix_ptr = &mut self.prefix as *mut u64 as *mut u8;
let mut prefix_ptr = prefix_u8.as_mut_ptr();
unroll! { unroll! {
for _i in 0..8 { for _i in 0..8 {
unsafe {
*prefix_ptr ^= (*bytes_ptr ^ *bytes_ptr.offset(8)) ^ (*bytes_ptr.offset(16) ^ *bytes_ptr.offset(24)); *prefix_ptr ^= (*bytes_ptr ^ *bytes_ptr.offset(8)) ^ (*bytes_ptr.offset(16) ^ *bytes_ptr.offset(24));
bytes_ptr = bytes_ptr.offset(1); bytes_ptr = bytes_ptr.offset(1);
prefix_ptr = prefix_ptr.offset(1); prefix_ptr = prefix_ptr.offset(1);
} }