add wasm64 support

Author: devsnek

crates/core_arch/src/core_arch_docs.md

@@ -191,6 +191,7 @@ others at:
 * [`powerpc64`]
 * [`nvptx`]
 * [`wasm32`]
+* [`wasm64`]
 
 [`x86`]: x86/index.html
 [`x86_64`]: x86_64/index.html
@@ -201,7 +202,8 @@ others at:
 [`powerpc`]: powerpc/index.html
 [`powerpc64`]: powerpc64/index.html
 [`nvptx`]: nvptx/index.html
-[`wasm32`]: wasm32/index.html
+[`wasm32`]: wasm/index.html
+[`wasm64`]: wasm/index.html
 
 # Examples
 

crates/core_arch/src/lib.rs

@@ -39,7 +39,7 @@
     extended_key_value_attributes
 )]
 #![cfg_attr(test, feature(test, abi_vectorcall))]
-#![cfg_attr(all(test, target_arch = "wasm32"), feature(wasm_simd))]
+#![cfg_attr(all(test, wasm), feature(wasm_simd))]
 #![deny(clippy::missing_inline_in_public_items)]
 #![allow(
     clippy::inline_always,

crates/core_arch/src/mod.rs

@@ -58,6 +58,17 @@ pub mod arch {
 
     /// Platform-specific intrinsics for the `wasm32` platform.
     ///
+    /// See the [module documentation](../index.html) for more details.
+    #[cfg(any(target_arch = "wasm32", doc))]
+    #[doc(cfg(target_arch = "wasm32"))]
+    #[stable(feature = "simd_wasm32", since = "1.33.0")]
+    pub mod wasm32 {
+        #[stable(feature = "simd_wasm32", since = "1.33.0")]
+        pub use crate::core_arch::wasm::*;
+    }
+
+    /// Platform-specific intrinsics for `wasm32` and `wasm64` platforms.
+    ///
     /// This module provides intrinsics specific to the WebAssembly
     /// architecture. Here you'll find intrinsics specific to WebAssembly that
     /// aren't otherwise surfaced somewhere in a cross-platform abstraction of
@@ -120,10 +131,10 @@ pub mod arch {
     /// example. You'd write a function such as:
     ///
     /// ```rust,ignore
-    /// #[cfg(target_arch = "wasm32")]
+    /// #[cfg(wasm)]
     /// #[target_feature(enable = "simd128")]
     /// unsafe fn uses_simd() {
-    ///     use std::arch::wasm32::*;
+    ///     use std::arch::wasm::*;
     ///     // ...
     /// }
     /// ```
@@ -163,12 +174,12 @@ pub mod arch {
     /// generated in your program. This means to generate a binary without SIMD
     /// you'll need to avoid both options above plus calling into any intrinsics
     /// in this module.
-    #[cfg(any(target_arch = "wasm32", doc))]
-    #[doc(cfg(target_arch = "wasm32"))]
-    #[stable(feature = "simd_wasm32", since = "1.33.0")]
-    pub mod wasm32 {
-        #[stable(feature = "simd_wasm32", since = "1.33.0")]
-        pub use crate::core_arch::wasm32::*;
+    #[cfg(any(wasm, doc))]
+    #[doc(cfg(wasm))]
+    #[stable(feature = "", since = "0.0.0")]
+    pub mod wasm {
+        #[stable(feature = "", since = "0.0.0")]
+        pub use crate::core_arch::wasm::*;
     }
 
     /// Platform-specific intrinsics for the `mips` platform.
@@ -238,9 +249,9 @@ mod aarch64;
 #[doc(cfg(any(target_arch = "arm", target_arch = "aarch64")))]
 mod arm;
 
-#[cfg(any(target_arch = "wasm32", doc))]
-#[doc(cfg(target_arch = "wasm32"))]
-mod wasm32;
+#[cfg(any(wasm, doc))]
+#[doc(cfg(wasm))]
+mod wasm;
 
 #[cfg(any(target_arch = "mips", target_arch = "mips64", doc))]
 #[doc(cfg(any(target_arch = "mips", target_arch = "mips64")))]

crates/core_arch/src/wasm32/atomic.rs renamed to crates/core_arch/src/wasm/atomic.rs

@@ -2,10 +2,10 @@
 use stdarch_test::assert_instr;
 
 extern "C" {
-    #[link_name = "llvm.wasm.memory.grow.i32"]
-    fn llvm_memory_grow(mem: u32, pages: i32) -> i32;
-    #[link_name = "llvm.wasm.memory.size.i32"]
-    fn llvm_memory_size(mem: u32) -> i32;
+    #[link_name = "llvm.wasm.memory.grow"]
+    fn llvm_memory_grow(mem: u32, pages: isize) -> usize;
+    #[link_name = "llvm.wasm.memory.size"]
+    fn llvm_memory_size(mem: u32) -> isize;
 }
 
 /// Corresponding intrinsic to wasm's [`memory.size` instruction][instr]
@@ -51,6 +51,6 @@ pub fn memory_size<const MEM: u32>() -> usize {
 pub fn memory_grow<const MEM: u32>(delta: usize) -> usize {
     unsafe {
         static_assert!(MEM: u32 where MEM == 0);
-        llvm_memory_grow(MEM, delta as i32) as isize as usize
+        llvm_memory_grow(MEM, delta as isize) as usize
     }
 }

crates/core_arch/src/wasm32/memory.rs renamed to crates/core_arch/src/wasm/memory.rs

@@ -1,4 +1,4 @@
-//! WASM32 intrinsics
+//! WebAssembly intrinsics
 
 #[cfg(test)]
 use stdarch_test::assert_instr;