diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2018-12-11 10:33:17 +0100 |
|---|---|---|
| committer | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2018-12-11 10:33:17 +0100 |
| commit | 134661917bf4b086b027a2c58219d50ba57a1453 (patch) | |
| tree | f954a1b18f25cd22fabaa738581243bc9ada6e19 /src/libstd/sys | |
| parent | 799cadb2bd980d1bcdcc831c2d0e50ec3b27527b (diff) | |
| download | rust-134661917bf4b086b027a2c58219d50ba57a1453.tar.gz rust-134661917bf4b086b027a2c58219d50ba57a1453.zip | |
Remove some dead code from `sgx`
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/sgx/abi/mem.rs | 7 | ||||
| -rw-r--r-- | src/libstd/sys/sgx/abi/usercalls/mod.rs | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/libstd/sys/sgx/abi/mem.rs b/src/libstd/sys/sgx/abi/mem.rs index 508f2ff4d4f..bf32c712216 100644 --- a/src/libstd/sys/sgx/abi/mem.rs +++ b/src/libstd/sys/sgx/abi/mem.rs @@ -34,13 +34,6 @@ fn image_base() -> u64 { base } -pub fn is_enclave_range(p: *const u8, len: usize) -> bool { - let start=p as u64; - let end=start + (len as u64); - start >= image_base() && - end <= image_base() + (unsafe { ENCLAVE_SIZE } as u64) // unsafe ok: link-time constant -} - pub fn is_user_range(p: *const u8, len: usize) -> bool { let start=p as u64; let end=start + (len as u64); diff --git a/src/libstd/sys/sgx/abi/usercalls/mod.rs b/src/libstd/sys/sgx/abi/usercalls/mod.rs index 2bc32c9fefb..d1d180e4825 100644 --- a/src/libstd/sys/sgx/abi/usercalls/mod.rs +++ b/src/libstd/sys/sgx/abi/usercalls/mod.rs @@ -33,14 +33,6 @@ pub fn read(fd: Fd, buf: &mut [u8]) -> IoResult<usize> { } } -pub fn read_alloc(fd: Fd) -> IoResult<Vec<u8>> { - unsafe { - let mut userbuf = alloc::User::<ByteBuffer>::uninitialized(); - raw::read_alloc(fd, userbuf.as_raw_mut_ptr()).from_sgx_result()?; - Ok(copy_user_buffer(&userbuf)) - } -} - pub fn write(fd: Fd, buf: &[u8]) -> IoResult<usize> { unsafe { let userbuf = alloc::User::new_from_enclave(buf); |
