Remove redundant code and merge rest into rt-std

Cargo.toml

@@ -57,7 +57,6 @@ exclude = [
 	"node/runtime/wasm",
 	"core/executor/wasm",
 	"pwasm-alloc",
-	"pwasm-libc",
 	"core/test-runtime/wasm",
 ]
 

core/executor/src/wasm_executor.rs

@@ -16,7 +16,6 @@
 
 //! Rust implementation of Substrate contracts.
 
-use std::cmp::Ordering;
 use std::collections::HashMap;
 
 use wasmi::{
@@ -161,33 +160,6 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
 		println!("{}", number);
 		Ok(())
 	},
-	ext_memcmp(s1: *const u8, s2: *const u8, n: usize) -> i32 => {
-		let sl1 = this.memory.get(s1, n as usize).map_err(|_| UserError("Invalid attempt to read from memory in first arg of ext_memcmp"))?;
-		let sl2 = this.memory.get(s2, n as usize).map_err(|_| UserError("Invalid attempt to read from memory in second arg of ext_memcmp"))?;
-		Ok(match sl1.cmp(&sl2) {
-			Ordering::Greater => 1,
-			Ordering::Less => -1,
-			Ordering::Equal => 0,
-		})
-	},
-	ext_memcpy(dest: *mut u8, src: *const u8, count: usize) -> *mut u8 => {
-		this.memory.copy_nonoverlapping(src as usize, dest as usize, count as usize)
-			.map_err(|_| UserError("Invalid attempt to copy_nonoverlapping in ext_memcpy"))?;
-		debug_trace!(target: "sr-io", "memcpy {} from {}, {} bytes", dest, src, count);
-		Ok(dest)
-	},
-	ext_memmove(dest: *mut u8, src: *const u8, count: usize) -> *mut u8 => {
-		this.memory.copy(src as usize, dest as usize, count as usize)
-			.map_err(|_| UserError("Invalid attempt to copy in ext_memmove"))?;
-		debug_trace!(target: "sr-io", "memmove {} from {}, {} bytes", dest, src, count);
-		Ok(dest)
-	},
-	ext_memset(dest: *mut u8, val: u32, count: usize) -> *mut u8 => {
-		debug_trace!(target: "sr-io", "memset {} with {}, {} bytes", dest, val, count);
-		this.memory.clear(dest as usize, val as u8, count as usize)
-			.map_err(|_| UserError("Invalid attempt to clear in ext_memset"))?;
-		Ok(dest)
-	},
 	ext_malloc(size: usize) -> *mut u8 => {
 		let r = this.heap.allocate(size);
 		debug_trace!(target: "sr-io", "malloc {} bytes at {}", size, r);

core/sr-std/Cargo.toml

@@ -7,10 +7,6 @@ build = "build.rs"
 [build-dependencies]
 rustc_version = "0.2"
 
-[dependencies]
-pwasm-alloc = { path = "../../pwasm-alloc" }
-pwasm-libc = { path = "../../pwasm-libc" }
-
 [features]
 default = ["std"]
 std = []

core/sr-std/src/lib.rs

@@ -23,6 +23,7 @@
 #![cfg_attr(not(feature = "std"), feature(panic_handler))]
 #![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
 #![cfg_attr(not(feature = "std"), feature(alloc))]
+//#![crate_type = "rlib"]
 
 #![cfg_attr(feature = "std", doc = "Polkadot runtime standard library as compiled when linked with Rust's standard library.")]
 #![cfg_attr(not(feature = "std"), doc = "Polkadot's runtime standard library as compiled without Rust's standard library.")]

core/sr-std/without_std.rs

@@ -16,10 +16,33 @@
 
 #[cfg(feature = "nightly")]
 extern crate alloc;
-#[cfg(feature = "nightly")]
-extern crate pwasm_libc;
-#[cfg(feature = "nightly")]
-extern crate pwasm_alloc;
+
+extern "C" {
+	fn ext_malloc(size: usize) -> *mut u8;
+	fn ext_free(ptr: *mut u8);
+}
+
+/// Wasm allocator
+pub struct WasmAllocator;
+
+#[global_allocator]
+static ALLOCATOR: WasmAllocator = WasmAllocator;
+
+mod __impl {
+	use core::alloc::{GlobalAlloc, Layout};
+
+	use super::WasmAllocator;
+
+	unsafe impl GlobalAlloc for WasmAllocator {
+		unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+			super::ext_malloc(layout.size()) as *mut u8
+		}
+
+		unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {
+			super::ext_free(ptr as *mut u8)
+		}
+	}
+}
 
 pub use alloc::boxed;
 pub use alloc::rc;

doc/packages/substrate.adoc

@@ -31,8 +31,6 @@ include::../../core/primitives/README.adoc[]
 
 include::../../pwasm-alloc/README.adoc[]
 
-include::../../pwasm-libc/README.adoc[]
-
 include::../../core/rpc/README.adoc[]
 
 include::../../core/rpc-servers/README.adoc[]