Merge pull request #2 from codebase-labs/0.16.20-wasm

Use c2rust implementation when targeting Wasm
betrusted-io · Nov 3, 2022 · de34076 · de34076
2 parents 0920704 + 97f508f
commit de34076
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -315,7 +315,7 @@ once_cell = { version = "1.5.2", default-features = false, features=["std"], opt
 once_cell = { version = "1.5.2", default-features = false, features=["std"] }
 
 [target.'cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown", target_env = ""))'.dependencies]
-web-sys = { version = "0.3.37", default-features = false, features = ["Crypto", "Window"] }
+web-sys = { version = "0.3.37", default-features = false, features = ["Crypto", "Window"], optional = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3.8", default-features = false, features = ["ntsecapi", "wtypesbase"] }
@@ -347,7 +347,7 @@ slow_tests = []
 std = ["alloc"]
 test_logging = []
 wasm32_c = []
-# wasm32_unknown_unknown_js = ["web-sys"]
+wasm32_unknown_unknown_js = ["web-sys"]
 size_optimized = []
 
 # XXX: debug = false because of https://github.com/rust-lang/rust/issues/34122

diff --git a/src/lib.rs b/src/lib.rs
@@ -81,7 +81,7 @@ extern crate alloc;
 #[macro_use]
 mod debug;
 
-#[cfg(target_os="xous")]
+#[cfg(any(target_arch="wasm32", target_os="xous"))]
 #[macro_use]
 mod prefixed;
 
@@ -109,11 +109,11 @@ pub mod io;
 
 mod cpu;
 pub mod digest;
-#[cfg(all(target_os="xous",not(target_arch="x86_64")))]
+#[cfg(any(target_arch="wasm32", all(target_os="xous",not(target_arch="x86_64"))))]
 pub mod ec_17;
-#[cfg(all(target_os="xous",not(target_arch="x86_64")))]
+#[cfg(any(target_arch="wasm32", all(target_os="xous",not(target_arch="x86_64"))))]
 pub use ec_17 as ec;
-#[cfg(not(all(target_os="xous",not(target_arch="x86_64"))))]
+#[cfg(not(any(target_arch="wasm32", all(target_os="xous",not(target_arch="x86_64")))))]
 mod ec;
 mod endian;
 pub mod error;
@@ -145,7 +145,7 @@ mod sealed {
     pub trait Sealed {}
 }
 
-#[cfg(target_os="xous")]
+#[cfg(any(target_arch="wasm32", target_os="xous"))]
 mod c2rust {
     pub mod aes_nohw;
     pub mod montgomery;
@@ -167,12 +167,12 @@ mod xous_rand;
 #[cfg(target_os="xous")]
 pub mod xous_test;
 
-#[cfg(target_os="xous")]
+#[cfg(any(target_arch="wasm32", target_os="xous"))]
 type c_char = i8;
-#[cfg(target_os="xous")]
+#[cfg(any(target_arch="wasm32", target_os="xous"))]
 type c_uint = u32;
-#[cfg(target_os="xous")]
 #[export_name = "__assert_fail"]
+#[cfg(any(target_arch="wasm32", target_os="xous"))]
 pub unsafe extern "C" fn __assert_fail(
     __assertion: *const c_char,
     __file: *const c_char,
@@ -181,4 +181,3 @@ pub unsafe extern "C" fn __assert_fail(
 ) -> ! {
     panic!("assert fail");
 }
-
diff --git a/src/limb.rs b/src/limb.rs
@@ -331,7 +331,7 @@ pub fn fold_5_bit_windows<R, I: FnOnce(Window) -> R, F: Fn(R, Window) -> R>(
         })
 }
 
-#[cfg(target_os="xous")]
+#[cfg(any(target_arch = "wasm32", target_os = "xous"))]
 #[inline]
 pub(crate) fn limbs_add_assign_mod(a: &mut [Limb], b: &[Limb], m: &[Limb]) {
     debug_assert_eq!(a.len(), m.len());

diff --git a/src/rand.rs b/src/rand.rs
@@ -264,6 +264,7 @@ mod sysrand_chunk {
 }
 
 #[cfg(all(
+    feature = "wasm32_unknown_unknown_js",
     target_arch = "wasm32",
     target_vendor = "unknown",
     target_os = "unknown",
@@ -291,6 +292,21 @@ mod sysrand_chunk {
     }
 }
 
+#[cfg(all(
+    not(feature = "wasm32_unknown_unknown_js"),
+    target_arch = "wasm32",
+    target_vendor = "unknown",
+    target_os = "unknown",
+    target_env = "",
+))]
+mod sysrand_chunk {
+    use crate::error;
+
+    pub fn chunk(mut _dest: &mut [u8]) -> Result<usize, error::Unspecified> {
+        unimplemented!()
+    }
+}
+
 #[cfg(windows)]
 mod sysrand_chunk {
     use crate::{error, polyfill};