Skip to content

Commit 2f72ab8

Browse files
pmurpmur
committed
Stabilize ppc inline assembly
1 parent 53efb3d commit 2f72ab8

File tree

2 files changed

+4
-35
lines changed

2 files changed

+4
-35
lines changed

‎compiler/rustc_ast_lowering/src/asm.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
5151
| asm::InlineAsmArch::LoongArch32
5252
| asm::InlineAsmArch::LoongArch64
5353
| asm::InlineAsmArch::S390x
54+
| asm::InlineAsmArch::PowerPC
55+
| asm::InlineAsmArch::PowerPC64
5456
);
5557
if !is_stable && !self.tcx.features().asm_experimental_arch() {
5658
feature_err(

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

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ The tracking issue for this feature is: [#93335]
88

99
This feature tracks `asm!` and `global_asm!` support for the following architectures:
1010
- NVPTX
11-
- PowerPC
1211
- Hexagon
1312
- MIPS32r2 and MIPS64r2
1413
- wasm32
@@ -31,15 +30,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
3130
| NVPTX | `reg64` | None\* | `l` |
3231
| Hexagon | `reg` | `r[0-28]` | `r` |
3332
| Hexagon | `preg` | `p[0-3]` | Only clobbers |
34-
| PowerPC | `reg` | `r0`, `r[3-12]`, `r[14-29]`\* | `r` |
35-
| PowerPC | `reg_nonzero` | `r[3-12]`, `r[14-29]`\* | `b` |
36-
| PowerPC | `freg` | `f[0-31]` | `f` |
37-
| PowerPC | `vreg` | `v[0-31]` | `v` |
38-
| PowerPC | `vsreg | `vs[0-63]` | `wa` |
39-
| PowerPC | `cr` | `cr[0-7]`, `cr` | Only clobbers |
40-
| PowerPC | `ctr` | `ctr` | Only clobbers |
41-
| PowerPC | `lr` | `lr` | Only clobbers |
42-
| PowerPC | `xer` | `xer` | Only clobbers |
4333
| wasm32 | `local` | None\* | `r` |
4434
| BPF | `reg` | `r[0-10]` | `r` |
4535
| BPF | `wreg` | `w[0-10]` | `w` |
@@ -61,8 +51,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
6151
> - NVPTX doesn't have a fixed register set, so named registers are not supported.
6252
>
6353
> - WebAssembly doesn't have registers, so named registers are not supported.
64-
>
65-
> - r29 is reserved only on 32 bit PowerPC targets.
6654
6755
# Register class supported types
6856

@@ -77,16 +65,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
7765
| NVPTX | `reg64` | None | `i8`, `i16`, `i32`, `f32`, `i64`, `f64` |
7866
| Hexagon | `reg` | None | `i8`, `i16`, `i32`, `f32` |
7967
| Hexagon | `preg` | N/A | Only clobbers |
80-
| PowerPC | `reg` | None | `i8`, `i16`, `i32`, `i64` (powerpc64 only) |
81-
| PowerPC | `reg_nonzero` | None | `i8`, `i16`, `i32`, `i64` (powerpc64 only) |
82-
| PowerPC | `freg` | None | `f32`, `f64` |
83-
| PowerPC | `vreg` | `altivec` | `i8x16`, `i16x8`, `i32x4`, `f32x4` |
84-
| PowerPC | `vreg` | `vsx` | `f32`, `f64`, `i64x2`, `f64x2` |
85-
| PowerPC | `vsreg` | `vsx` | The union of vsx and altivec vreg types |
86-
| PowerPC | `cr` | N/A | Only clobbers |
87-
| PowerPC | `ctr` | N/A | Only clobbers |
88-
| PowerPC | `lr` | N/A | Only clobbers |
89-
| PowerPC | `xer` | N/A | Only clobbers |
9068
| wasm32 | `local` | None | `i8` `i16` `i32` `i64` `f32` `f64` |
9169
| BPF | `reg` | None | `i8` `i16` `i32` `i64` |
9270
| BPF | `wreg` | `alu32` | `i8` `i16` `i32` |
@@ -107,10 +85,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
10785
| Hexagon | `r29` | `sp` |
10886
| Hexagon | `r30` | `fr` |
10987
| Hexagon | `r31` | `lr` |
110-
| PowerPC | `r1` | `sp` |
111-
| PowerPC | `r31` | `fp` |
112-
| PowerPC | `r[0-31]` | `[0-31]` |
113-
| PowerPC | `f[0-31]` | `fr[0-31]`|
11488
| BPF | `r[0-10]` | `w[0-10]` |
11589
| AVR | `XH` | `r27` |
11690
| AVR | `XL` | `r26` |
@@ -149,16 +123,14 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
149123
| Architecture | Unsupported register | Reason |
150124
| ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
151125
| All | `sp`, `r14`/`o6` (SPARC) | The stack pointer must be restored to its original value at the end of an asm code block. |
152-
| All | `fr` (Hexagon), `fp` (PowerPC), `$fp` (MIPS), `Y` (AVR), `r4` (MSP430), `a6` (M68k), `r30`/`i6` (SPARC) | The frame pointer cannot be used as an input or output. |
153-
| All | `r19` (Hexagon), `r29` (PowerPC 32 bit only), `r30` (PowerPC) | These are used internally by LLVM as "base pointer" for functions with complex stack frames. |
126+
| All | `fr` (Hexagon) `$fp` (MIPS), `Y` (AVR), `r4` (MSP430), `a6` (M68k), `r30`/`i6` (SPARC) | The frame pointer cannot be used as an input or output. |
127+
| All | `r19` (Hexagon) | These are used internally by LLVM as "base pointer" for functions with complex stack frames. |
154128
| MIPS | `$0` or `$zero` | This is a constant zero register which can't be modified. |
155129
| MIPS | `$1` or `$at` | Reserved for assembler. |
156130
| MIPS | `$26`/`$k0`, `$27`/`$k1` | OS-reserved registers. |
157131
| MIPS | `$28`/`$gp` | Global pointer cannot be used as inputs or outputs. |
158132
| MIPS | `$ra` | Return address cannot be used as inputs or outputs. |
159133
| Hexagon | `lr` | This is the link register which cannot be used as an input or output. |
160-
| PowerPC | `r2`, `r13` | These are system reserved registers. |
161-
| PowerPC | `vrsave` | The vrsave register cannot be used as an input or output. |
162134
| 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. |
163135
|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. |
164136
| M68k | `a4`, `a5` | Used internally by LLVM for the base pointer and global base pointer. |
@@ -185,11 +157,6 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
185157
| NVPTX | `reg32` | None | `r0` | None |
186158
| NVPTX | `reg64` | None | `rd0` | None |
187159
| Hexagon | `reg` | None | `r0` | None |
188-
| PowerPC | `reg` | None | `0` | None |
189-
| PowerPC | `reg_nonzero` | None | `3` | None |
190-
| PowerPC | `freg` | None | `0` | None |
191-
| PowerPC | `vreg` | None | `0` | None |
192-
| PowerPC | `vsreg` | None | `0` | None |
193160
| SPARC | `reg` | None | `%o0` | None |
194161
| CSKY | `reg` | None | `r0` | None |
195162
| CSKY | `freg` | None | `f0` | None |

0 commit comments

Comments
 (0)