Skip to content

feat: Rename architecture to wasm32 #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2020
Merged

feat: Rename architecture to wasm32 #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions symbolic-common/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ pub enum CpuFamily {
Mips64 = 8,
/// ILP32 ABI on 64-bit ARM.
Arm64_32 = 9,
/// Virtual WASM architecture.
Wasm = 10,
/// Virtual WASM 32-bit architecture.
Wasm32 = 10,
}

impl CpuFamily {
Expand All @@ -113,7 +113,7 @@ impl CpuFamily {
pub fn pointer_size(self) -> Option<usize> {
match self {
CpuFamily::Unknown => None,
CpuFamily::Wasm => Some(4),
CpuFamily::Wasm32 => Some(4),
CpuFamily::Amd64
| CpuFamily::Arm64
| CpuFamily::Ppc64
Expand Down Expand Up @@ -142,7 +142,7 @@ impl CpuFamily {
/// ```
pub fn instruction_alignment(self) -> Option<u64> {
match self {
CpuFamily::Wasm => Some(4),
CpuFamily::Wasm32 => Some(4),
CpuFamily::Arm32 => Some(2),
CpuFamily::Arm64 | CpuFamily::Arm64_32 => Some(4),
CpuFamily::Ppc32 | CpuFamily::Mips32 | CpuFamily::Mips64 => Some(4),
Expand Down Expand Up @@ -178,7 +178,7 @@ impl CpuFamily {
CpuFamily::Arm32 | CpuFamily::Arm64 | CpuFamily::Arm64_32 => Some("pc"),
CpuFamily::Ppc32 | CpuFamily::Ppc64 => Some("srr0"),
CpuFamily::Mips32 | CpuFamily::Mips64 => Some("pc"),
CpuFamily::Wasm => None,
CpuFamily::Wasm32 => None,
CpuFamily::Unknown => None,
}
}
Expand Down Expand Up @@ -285,7 +285,7 @@ pub enum Arch {
Arm64_32 = 901,
Arm64_32V8 = 902,
Arm64_32Unknown = 999,
Wasm = 1001,
Wasm32 = 1001,
}

impl Arch {
Expand Down Expand Up @@ -331,7 +331,7 @@ impl Arch {
901 => Arch::Arm64_32,
902 => Arch::Arm64_32V8,
999 => Arch::Arm64_32Unknown,
1001 => Arch::Wasm,
1001 => Arch::Wasm32,
_ => Arch::Unknown,
}
}
Expand Down Expand Up @@ -368,7 +368,7 @@ impl Arch {
Arch::Mips => CpuFamily::Mips32,
Arch::Mips64 => CpuFamily::Mips64,
Arch::Arm64_32 | Arch::Arm64_32V8 | Arch::Arm64_32Unknown => CpuFamily::Arm64_32,
Arch::Wasm => CpuFamily::Wasm,
Arch::Wasm32 => CpuFamily::Wasm32,
}
}

Expand All @@ -392,7 +392,7 @@ impl Arch {
pub fn name(self) -> &'static str {
match self {
Arch::Unknown => "unknown",
Arch::Wasm => "wasm",
Arch::Wasm32 => "wasm32",
Arch::X86 => "x86",
Arch::X86Unknown => "x86_unknown",
Arch::Amd64 => "x86_64",
Expand Down Expand Up @@ -501,7 +501,7 @@ impl str::FromStr for Arch {
"arm-64" => Arch::Arm64,

// wasm extensions
"wasm" => Arch::Wasm,
"wasm32" => Arch::Wasm32,

_ => return Err(UnknownArchError),
})
Expand Down
5 changes: 3 additions & 2 deletions symbolic-debuginfo/src/wasm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl<'data> WasmObject<'data> {
})
}

/// The container file format, which is always `FileFormat::Wasm`.
/// The container file format, which currently is always `FileFormat::Wasm`.
pub fn file_format(&self) -> FileFormat {
FileFormat::Wasm
}
Expand Down Expand Up @@ -99,7 +99,8 @@ impl<'data> WasmObject<'data> {

/// The CPU architecture of this object.
pub fn arch(&self) -> Arch {
Arch::Wasm
// TODO: we do not yet support wasm64 and thus always return wasm32 here.
Arch::Wasm32
}

/// The kind of this object.
Expand Down