Skip to content

Commit 498553f

Browse files
borsbors
committed
Auto merge of #111235 - loongarch-rs:stabilize-asm, r=Amanieu
Stabilize inline asm for LoongArch64 This PR is used to tracking for stabilize `inline asm` for LoongArch64. **Status** - [x] #111237 - [x] #111332 - [ ] rust-lang/reference#1357 Any others I missed? r? `@Amanieu`
2 parents 99ff5af + 46252ef commit 498553f

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

‎compiler/rustc_ast_lowering/src/asm.rs

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
4444
| asm::InlineAsmArch::AArch64
4545
| asm::InlineAsmArch::RiscV32
4646
| asm::InlineAsmArch::RiscV64
47+
| asm::InlineAsmArch::LoongArch64
4748
);
4849
if !is_stable && !self.tcx.features().asm_experimental_arch {
4950
feature_err(

‎src/doc/unstable-book/src/language-features/asm-experimental-arch.md

+1-16
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
1717
- AVR
1818
- MSP430
1919
- M68k
20-
- LoongArch
2120
- s390x
2221

2322
## Register classes
@@ -47,8 +46,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
4746
| M68k | `reg` | `d[0-7]`, `a[0-7]` | `r` |
4847
| M68k | `reg_data` | `d[0-7]` | `d` |
4948
| M68k | `reg_addr` | `a[0-3]` | `a` |
50-
| LoongArch | `reg` | `$r1`, `$r[4-20]`, `$r[23,30]` | `r` |
51-
| LoongArch | `freg` | `$f[0-31]` | `f` |
5249
| s390x | `reg` | `r[0-10]`, `r[12-14]` | `r` |
5350
| s390x | `freg` | `f[0-15]` | `f` |
5451

@@ -82,8 +79,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
8279
| MSP430 | `reg` | None | `i8`, `i16` |
8380
| M68k | `reg`, `reg_addr` | None | `i16`, `i32` |
8481
| M68k | `reg_data` | None | `i8`, `i16`, `i32` |
85-
| LoongArch64 | `reg` | None | `i8`, `i16`, `i32`, `i64`, `f32`, `f64` |
86-
| LoongArch64 | `freg` | None | `f32`, `f64` |
8782
| s390x | `reg` | None | `i8`, `i16`, `i32`, `i64` |
8883
| s390x | `freg` | None | `f32`, `f64` |
8984

@@ -107,10 +102,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
107102
| M68k | `a5` | `bp` |
108103
| M68k | `a6` | `fp` |
109104
| M68k | `a7` | `sp`, `usp`, `ssp`, `isp` |
110-
| LoongArch | `$r0` | `zero` |
111-
| LoongArch | `$r2` | `tp` |
112-
| LoongArch | `$r3` | `sp` |
113-
| LoongArch | `$r22` | `fp` |
114105

115106
> **Notes**:
116107
> - TI does not mandate a frame pointer for MSP430, but toolchains are allowed
@@ -121,7 +112,7 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
121112
| Architecture | Unsupported register | Reason |
122113
| ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
123114
| All | `sp`, `r15` (s390x) | The stack pointer must be restored to its original value at the end of an asm code block. |
124-
| All | `fr` (Hexagon), `$fp` (MIPS), `Y` (AVR), `r4` (MSP430), `a6` (M68k), `$fp` (LoongArch), `r11` (s390x) | The frame pointer cannot be used as an input or output. |
115+
| All | `fr` (Hexagon), `$fp` (MIPS), `Y` (AVR), `r4` (MSP430), `a6` (M68k), `r11` (s390x) | The frame pointer cannot be used as an input or output. |
125116
| All | `r19` (Hexagon) | This is used internally by LLVM as a "base pointer" for functions with complex stack frames. |
126117
| MIPS | `$0` or `$zero` | This is a constant zero register which can't be modified. |
127118
| MIPS | `$1` or `$at` | Reserved for assembler. |
@@ -132,10 +123,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
132123
| AVR | `r0`, `r1`, `r1r0` | Due to an issue in LLVM, the `r0` and `r1` registers cannot be used as inputs or outputs. If modified, they must be restored to their original values before the end of the block. |
133124
|MSP430 | `r0`, `r2`, `r3` | These are the program counter, status register, and constant generator respectively. Neither the status register nor constant generator can be written to. |
134125
| M68k | `a4`, `a5` | Used internally by LLVM for the base pointer and global base pointer. |
135-
| LoongArch | `$r0` or `$zero` | This is a constant zero register which can't be modified. |
136-
| LoongArch | `$r2` or `$tp` | This is reserved for TLS. |
137-
| LoongArch | `$r21` | This is reserved by the ABI. |
138-
| LoongArch | `$r31` or `$s8` | This is used internally by LLVM. |
139126

140127
## Template modifiers
141128

@@ -150,8 +137,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
150137
| PowerPC | `reg` | None | `0` | None |
151138
| PowerPC | `reg_nonzero` | None | `3` | `b` |
152139
| PowerPC | `freg` | None | `0` | None |
153-
| LoongArch | `reg` | None | `$r2` | None |
154-
| LoongArch | `freg` | None | `$f0` | None |
155140
| s390x | `reg` | None | `%r0` | None |
156141
| s390x | `freg` | None | `%f0` | None |
157142

0 commit comments

Comments
 (0)