language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 22:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Rename Arm to Aarch32, fix some of its code gen

Browse source 
As far as I can tell, Aarch32 only supports 32-bit
registers, so its pointers should be 4 bytes and
its F64 alignment should be 4 bytes as well
(because it's emulated in software).
This commit is contained in:
Richard Feldman 2022-05-24 10:54:45 -04:00
parent 777625be21
commit fb5f30e5ed
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bindgen/src/bindgen_rs.rs
View file

@ -1134,7 +1134,7 @@ fn arch_to_str(architecture: &Architecture) -> &'static str {
Architecture::X86_64 => "x86_64", Architecture::X86_64 => "x86_64",
Architecture::X86_32 => "x86", Architecture::X86_32 => "x86",
Architecture::Aarch64 => "aarch64", Architecture::Aarch64 => "aarch64",
Architecture::Arm => "arm", Architecture::Aarch32 => "arm",
Architecture::Wasm32 => "wasm32", Architecture::Wasm32 => "wasm32",
} }
} }

9
compiler/builtins/src/bitcode.rs
View file

@ -60,11 +60,8 @@ impl FloatWidth {
match self { match self {
F32 => 4, F32 => 4,
F64 | F128 => match target_info.architecture { F64 | F128 => match target_info.architecture {
Architecture::X86_64 Architecture::X86_64 | Architecture::Aarch64 | Architecture::Wasm32 => 8,
| Architecture::Aarch64 Architecture::X86_32 | Architecture::Aarch32 => 4,
| Architecture::Arm
| Architecture::Wasm32 => 8,
Architecture::X86_32 => 4,
}, },
} }
} }
@ -129,7 +126,7 @@ impl IntWidth {
U64 | I64 => match target_info.architecture { U64 | I64 => match target_info.architecture {
Architecture::X86_64 Architecture::X86_64
| Architecture::Aarch64 | Architecture::Aarch64
| Architecture::Arm | Architecture::Aarch32
| Architecture::Wasm32 => 8, | Architecture::Wasm32 => 8,
Architecture::X86_32 => 4, Architecture::X86_32 => 4,
}, },

8
compiler/roc_target/src/lib.rs
View file

@ -70,7 +70,7 @@ pub enum Architecture {
X86_64, X86_64,
X86_32, X86_32,
Aarch64, Aarch64,
Arm, Aarch32,
Wasm32, Wasm32,
} }
@ -79,8 +79,8 @@ impl Architecture {
use Architecture::*; use Architecture::*;
match self { match self {
X86_64 | Aarch64 | Arm => PtrWidth::Bytes8, X86_64 | Aarch64 => PtrWidth::Bytes8,
X86_32 | Wasm32 => PtrWidth::Bytes4, X86_32 | Aarch32 | Wasm32 => PtrWidth::Bytes4,
} }
} }
@ -95,7 +95,7 @@ impl From<target_lexicon::Architecture> for Architecture {
target_lexicon::Architecture::X86_64 => Architecture::X86_64, target_lexicon::Architecture::X86_64 => Architecture::X86_64,
target_lexicon::Architecture::X86_32(_) => Architecture::X86_32, target_lexicon::Architecture::X86_32(_) => Architecture::X86_32,
target_lexicon::Architecture::Aarch64(_) => Architecture::Aarch64, target_lexicon::Architecture::Aarch64(_) => Architecture::Aarch64,
target_lexicon::Architecture::Arm(_) => Architecture::Arm, target_lexicon::Architecture::Arm(_) => Architecture::Aarch32,
target_lexicon::Architecture::Wasm32 => Architecture::Wasm32, target_lexicon::Architecture::Wasm32 => Architecture::Wasm32,
_ => unreachable!("unsupported architecture"), _ => unreachable!("unsupported architecture"),
} }