Skip to content

Commit e14b81f

Browse files
borsbors
committed
Auto merge of rust-lang#109989 - ids1024:m68k-asm, r=Amanieu
Add inline assembly support for m68k I believe this should be correct, to the extent I understand the logic around inline assembly. M68k is fairly straightforward here, other than having separate address registers.
2 parents fab9907 + 2ac8dee commit e14b81f

File tree

7 files changed

+220
-1
lines changed

7 files changed

+220
-1
lines changed

‎compiler/rustc_codegen_gcc/src/asm.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,9 @@ fn reg_to_gcc(reg: InlineAsmRegOrRegClass) -> ConstraintOrRegister {
593593
InlineAsmRegClass::Bpf(BpfInlineAsmRegClass::reg) => "r",
594594
InlineAsmRegClass::Bpf(BpfInlineAsmRegClass::wreg) => "w",
595595
InlineAsmRegClass::Hexagon(HexagonInlineAsmRegClass::reg) => "r",
596+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg) => "r",
597+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg_addr) => "a",
598+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg_data) => "d",
596599
InlineAsmRegClass::Mips(MipsInlineAsmRegClass::reg) => "d", // more specific than "r"
597600
InlineAsmRegClass::Mips(MipsInlineAsmRegClass::freg) => "f",
598601
InlineAsmRegClass::Msp430(Msp430InlineAsmRegClass::reg) => "r",
@@ -664,6 +667,9 @@ fn dummy_output_type<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, reg: InlineAsmRegCl
664667
InlineAsmRegClass::Avr(_) => unimplemented!(),
665668
InlineAsmRegClass::Bpf(_) => unimplemented!(),
666669
InlineAsmRegClass::Hexagon(HexagonInlineAsmRegClass::reg) => cx.type_i32(),
670+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg) => cx.type_i32(),
671+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg_addr) => cx.type_i32(),
672+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg_data) => cx.type_i32(),
667673
InlineAsmRegClass::Mips(MipsInlineAsmRegClass::reg) => cx.type_i32(),
668674
InlineAsmRegClass::Mips(MipsInlineAsmRegClass::freg) => cx.type_f32(),
669675
InlineAsmRegClass::Msp430(_) => unimplemented!(),
@@ -849,6 +855,7 @@ fn modifier_to_gcc(arch: InlineAsmArch, reg: InlineAsmRegClass, modifier: Option
849855
InlineAsmRegClass::Avr(_) => None,
850856
InlineAsmRegClass::S390x(_) => None,
851857
InlineAsmRegClass::Msp430(_) => None,
858+
InlineAsmRegClass::M68k(_) => None,
852859
InlineAsmRegClass::SpirV(SpirVInlineAsmRegClass::reg) => {
853860
bug!("LLVM backend does not support SPIR-V")
854861
}

‎compiler/rustc_codegen_llvm/src/asm.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ impl<'ll, 'tcx> AsmBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
244244
InlineAsmArch::Msp430 => {
245245
constraints.push("~{sr}".to_string());
246246
}
247+
InlineAsmArch::M68k => {
248+
constraints.push("~{ccr}".to_string());
249+
}
247250
}
248251
}
249252
if !options.contains(InlineAsmOptions::NOMEM) {
@@ -671,6 +674,9 @@ fn reg_to_llvm(reg: InlineAsmRegOrRegClass, layout: Option<&TyAndLayout<'_>>) ->
671674
InlineAsmRegClass::S390x(S390xInlineAsmRegClass::reg) => "r",
672675
InlineAsmRegClass::S390x(S390xInlineAsmRegClass::freg) => "f",
673676
InlineAsmRegClass::Msp430(Msp430InlineAsmRegClass::reg) => "r",
677+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg) => "r",
678+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg_addr) => "a",
679+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg_data) => "d",
674680
InlineAsmRegClass::SpirV(SpirVInlineAsmRegClass::reg) => {
675681
bug!("LLVM backend does not support SPIR-V")
676682
}
@@ -768,6 +774,7 @@ fn modifier_to_llvm(
768774
InlineAsmRegClass::SpirV(SpirVInlineAsmRegClass::reg) => {
769775
bug!("LLVM backend does not support SPIR-V")
770776
}
777+
InlineAsmRegClass::M68k(_) => None,
771778
InlineAsmRegClass::Err => unreachable!(),
772779
}
773780
}
@@ -839,6 +846,9 @@ fn dummy_output_type<'ll>(cx: &CodegenCx<'ll, '_>, reg: InlineAsmRegClass) -> &'
839846
InlineAsmRegClass::S390x(S390xInlineAsmRegClass::reg) => cx.type_i32(),
840847
InlineAsmRegClass::S390x(S390xInlineAsmRegClass::freg) => cx.type_f64(),
841848
InlineAsmRegClass::Msp430(Msp430InlineAsmRegClass::reg) => cx.type_i16(),
849+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg) => cx.type_i32(),
850+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg_addr) => cx.type_i32(),
851+
InlineAsmRegClass::M68k(M68kInlineAsmRegClass::reg_data) => cx.type_i32(),
842852
InlineAsmRegClass::SpirV(SpirVInlineAsmRegClass::reg) => {
843853
bug!("LLVM backend does not support SPIR-V")
844854
}

‎compiler/rustc_span/src/symbol.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,7 +1175,9 @@ symbols! {
11751175
reg32,
11761176
reg64,
11771177
reg_abcd,
1178+
reg_addr,
11781179
reg_byte,
1180+
reg_data,
11791181
reg_iw,
11801182
reg_nonzero,
11811183
reg_pair,

‎compiler/rustc_target/src/asm/m68k.rs

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
use super::{InlineAsmArch, InlineAsmType};
2+
use rustc_macros::HashStable_Generic;
3+
use rustc_span::Symbol;
4+
use std::fmt;
5+
6+
def_reg_class! {
7+
M68k M68kInlineAsmRegClass {
8+
reg,
9+
reg_addr,
10+
reg_data,
11+
}
12+
}
13+
14+
impl M68kInlineAsmRegClass {
15+
pub fn valid_modifiers(self, _arch: super::InlineAsmArch) -> &'static [char] {
16+
&[]
17+
}
18+
19+
pub fn suggest_class(self, _arch: InlineAsmArch, _ty: InlineAsmType) -> Option<Self> {
20+
None
21+
}
22+
23+
pub fn suggest_modifier(
24+
self,
25+
_arch: InlineAsmArch,
26+
_ty: InlineAsmType,
27+
) -> Option<(char, &'static str)> {
28+
None
29+
}
30+
31+
pub fn default_modifier(self, _arch: InlineAsmArch) -> Option<(char, &'static str)> {
32+
None
33+
}
34+
35+
pub fn supported_types(
36+
self,
37+
_arch: InlineAsmArch,
38+
) -> &'static [(InlineAsmType, Option<Symbol>)] {
39+
match self {
40+
Self::reg => types! { _: I16, I32; },
41+
Self::reg_data => types! { _: I8, I16, I32; },
42+
Self::reg_addr => types! { _: I16, I32; },
43+
}
44+
}
45+
}
46+
47+
def_regs! {
48+
M68k M68kInlineAsmReg M68kInlineAsmRegClass {
49+
d0: reg, reg_data = ["d0"],
50+
d1: reg, reg_data = ["d1"],
51+
d2: reg, reg_data = ["d2"],
52+
d3: reg, reg_data = ["d3"],
53+
d4: reg, reg_data = ["d4"],
54+
d5: reg, reg_data = ["d5"],
55+
d6: reg, reg_data = ["d6"],
56+
d7: reg, reg_data = ["d7"],
57+
a0: reg, reg_addr = ["a0"],
58+
a1: reg, reg_addr = ["a1"],
59+
a2: reg, reg_addr = ["a2"],
60+
a3: reg, reg_addr = ["a3"],
61+
#error = ["a4"] =>
62+
"a4 is used internally by LLVM and cannot be used as an operand for inline asm",
63+
#error = ["a5", "bp"] =>
64+
"a5 is used internally by LLVM and cannot be used as an operand for inline asm",
65+
#error = ["a6", "fp"] =>
66+
"a6 is used internally by LLVM and cannot be used as an operand for inline asm",
67+
#error = ["a7", "sp", "usp", "ssp", "isp"] =>
68+
"the stack pointer cannot be used as an operand for inline asm",
69+
}
70+
}
71+
72+
impl M68kInlineAsmReg {
73+
pub fn emit(
74+
self,
75+
out: &mut dyn fmt::Write,
76+
_arch: InlineAsmArch,
77+
_modifier: Option<char>,
78+
) -> fmt::Result {
79+
out.write_str(self.name())
80+
}
81+
}

‎compiler/rustc_target/src/asm/mod.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ mod arm;
168168
mod avr;
169169
mod bpf;
170170
mod hexagon;
171+
mod m68k;
171172
mod mips;
172173
mod msp430;
173174
mod nvptx;
@@ -183,6 +184,7 @@ pub use arm::{ArmInlineAsmReg, ArmInlineAsmRegClass};
183184
pub use avr::{AvrInlineAsmReg, AvrInlineAsmRegClass};
184185
pub use bpf::{BpfInlineAsmReg, BpfInlineAsmRegClass};
185186
pub use hexagon::{HexagonInlineAsmReg, HexagonInlineAsmRegClass};
187+
pub use m68k::{M68kInlineAsmReg, M68kInlineAsmRegClass};
186188
pub use mips::{MipsInlineAsmReg, MipsInlineAsmRegClass};
187189
pub use msp430::{Msp430InlineAsmReg, Msp430InlineAsmRegClass};
188190
pub use nvptx::{NvptxInlineAsmReg, NvptxInlineAsmRegClass};
@@ -214,6 +216,7 @@ pub enum InlineAsmArch {
214216
Bpf,
215217
Avr,
216218
Msp430,
219+
M68k,
217220
}
218221

219222
impl FromStr for InlineAsmArch {
@@ -240,6 +243,7 @@ impl FromStr for InlineAsmArch {
240243
"bpf" => Ok(Self::Bpf),
241244
"avr" => Ok(Self::Avr),
242245
"msp430" => Ok(Self::Msp430),
246+
"m68k" => Ok(Self::M68k),
243247
_ => Err(()),
244248
}
245249
}
@@ -262,6 +266,7 @@ pub enum InlineAsmReg {
262266
Bpf(BpfInlineAsmReg),
263267
Avr(AvrInlineAsmReg),
264268
Msp430(Msp430InlineAsmReg),
269+
M68k(M68kInlineAsmReg),
265270
// Placeholder for invalid register constraints for the current target
266271
Err,
267272
}
@@ -280,6 +285,7 @@ impl InlineAsmReg {
280285
Self::Bpf(r) => r.name(),
281286
Self::Avr(r) => r.name(),
282287
Self::Msp430(r) => r.name(),
288+
Self::M68k(r) => r.name(),
283289
Self::Err => "<reg>",
284290
}
285291
}
@@ -297,6 +303,7 @@ impl InlineAsmReg {
297303
Self::Bpf(r) => InlineAsmRegClass::Bpf(r.reg_class()),
298304
Self::Avr(r) => InlineAsmRegClass::Avr(r.reg_class()),
299305
Self::Msp430(r) => InlineAsmRegClass::Msp430(r.reg_class()),
306+
Self::M68k(r) => InlineAsmRegClass::M68k(r.reg_class()),
300307
Self::Err => InlineAsmRegClass::Err,
301308
}
302309
}
@@ -328,6 +335,7 @@ impl InlineAsmReg {
328335
InlineAsmArch::Bpf => Self::Bpf(BpfInlineAsmReg::parse(name)?),
329336
InlineAsmArch::Avr => Self::Avr(AvrInlineAsmReg::parse(name)?),
330337
InlineAsmArch::Msp430 => Self::Msp430(Msp430InlineAsmReg::parse(name)?),
338+
InlineAsmArch::M68k => Self::M68k(M68kInlineAsmReg::parse(name)?),
331339
})
332340
}
333341

@@ -351,6 +359,7 @@ impl InlineAsmReg {
351359
Self::Bpf(r) => r.validate(arch, reloc_model, target_features, target, is_clobber),
352360
Self::Avr(r) => r.validate(arch, reloc_model, target_features, target, is_clobber),
353361
Self::Msp430(r) => r.validate(arch, reloc_model, target_features, target, is_clobber),
362+
Self::M68k(r) => r.validate(arch, reloc_model, target_features, target, is_clobber),
354363
Self::Err => unreachable!(),
355364
}
356365
}
@@ -375,6 +384,7 @@ impl InlineAsmReg {
375384
Self::Bpf(r) => r.emit(out, arch, modifier),
376385
Self::Avr(r) => r.emit(out, arch, modifier),
377386
Self::Msp430(r) => r.emit(out, arch, modifier),
387+
Self::M68k(r) => r.emit(out, arch, modifier),
378388
Self::Err => unreachable!("Use of InlineAsmReg::Err"),
379389
}
380390
}
@@ -392,6 +402,7 @@ impl InlineAsmReg {
392402
Self::Bpf(r) => r.overlapping_regs(|r| cb(Self::Bpf(r))),
393403
Self::Avr(r) => r.overlapping_regs(|r| cb(Self::Avr(r))),
394404
Self::Msp430(_) => cb(self),
405+
Self::M68k(_) => cb(self),
395406
Self::Err => unreachable!("Use of InlineAsmReg::Err"),
396407
}
397408
}
@@ -414,6 +425,7 @@ pub enum InlineAsmRegClass {
414425
Bpf(BpfInlineAsmRegClass),
415426
Avr(AvrInlineAsmRegClass),
416427
Msp430(Msp430InlineAsmRegClass),
428+
M68k(M68kInlineAsmRegClass),
417429
// Placeholder for invalid register constraints for the current target
418430
Err,
419431
}
@@ -435,6 +447,7 @@ impl InlineAsmRegClass {
435447
Self::Bpf(r) => r.name(),
436448
Self::Avr(r) => r.name(),
437449
Self::Msp430(r) => r.name(),
450+
Self::M68k(r) => r.name(),
438451
Self::Err => rustc_span::symbol::sym::reg,
439452
}
440453
}
@@ -458,6 +471,7 @@ impl InlineAsmRegClass {
458471
Self::Bpf(r) => r.suggest_class(arch, ty).map(InlineAsmRegClass::Bpf),
459472
Self::Avr(r) => r.suggest_class(arch, ty).map(InlineAsmRegClass::Avr),
460473
Self::Msp430(r) => r.suggest_class(arch, ty).map(InlineAsmRegClass::Msp430),
474+
Self::M68k(r) => r.suggest_class(arch, ty).map(InlineAsmRegClass::M68k),
461475
Self::Err => unreachable!("Use of InlineAsmRegClass::Err"),
462476
}
463477
}
@@ -488,6 +502,7 @@ impl InlineAsmRegClass {
488502
Self::Bpf(r) => r.suggest_modifier(arch, ty),
489503
Self::Avr(r) => r.suggest_modifier(arch, ty),
490504
Self::Msp430(r) => r.suggest_modifier(arch, ty),
505+
Self::M68k(r) => r.suggest_modifier(arch, ty),
491506
Self::Err => unreachable!("Use of InlineAsmRegClass::Err"),
492507
}
493508
}
@@ -514,6 +529,7 @@ impl InlineAsmRegClass {
514529
Self::Bpf(r) => r.default_modifier(arch),
515530
Self::Avr(r) => r.default_modifier(arch),
516531
Self::Msp430(r) => r.default_modifier(arch),
532+
Self::M68k(r) => r.default_modifier(arch),
517533
Self::Err => unreachable!("Use of InlineAsmRegClass::Err"),
518534
}
519535
}
@@ -539,6 +555,7 @@ impl InlineAsmRegClass {
539555
Self::Bpf(r) => r.supported_types(arch),
540556
Self::Avr(r) => r.supported_types(arch),
541557
Self::Msp430(r) => r.supported_types(arch),
558+
Self::M68k(r) => r.supported_types(arch),
542559
Self::Err => unreachable!("Use of InlineAsmRegClass::Err"),
543560
}
544561
}
@@ -569,6 +586,7 @@ impl InlineAsmRegClass {
569586
InlineAsmArch::Bpf => Self::Bpf(BpfInlineAsmRegClass::parse(name)?),
570587
InlineAsmArch::Avr => Self::Avr(AvrInlineAsmRegClass::parse(name)?),
571588
InlineAsmArch::Msp430 => Self::Msp430(Msp430InlineAsmRegClass::parse(name)?),
589+
InlineAsmArch::M68k => Self::M68k(M68kInlineAsmRegClass::parse(name)?),
572590
})
573591
}
574592

@@ -590,6 +608,7 @@ impl InlineAsmRegClass {
590608
Self::Bpf(r) => r.valid_modifiers(arch),
591609
Self::Avr(r) => r.valid_modifiers(arch),
592610
Self::Msp430(r) => r.valid_modifiers(arch),
611+
Self::M68k(r) => r.valid_modifiers(arch),
593612
Self::Err => unreachable!("Use of InlineAsmRegClass::Err"),
594613
}
595614
}
@@ -776,6 +795,11 @@ pub fn allocatable_registers(
776795
msp430::fill_reg_map(arch, reloc_model, target_features, target, &mut map);
777796
map
778797
}
798+
InlineAsmArch::M68k => {
799+
let mut map = m68k::regclass_map();
800+
m68k::fill_reg_map(arch, reloc_model, target_features, target, &mut map);
801+
map
802+
}
779803
}
780804
}
781805

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
1616
- SPIR-V
1717
- AVR
1818
- MSP430
19+
- M68k
1920

2021
## Register classes
2122

@@ -41,6 +42,9 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
4142
| AVR | `reg_iw` | `r25r24`, `X`, `Z` | `w` |
4243
| AVR | `reg_ptr` | `X`, `Z` | `e` |
4344
| MSP430 | `reg` | `r[0-15]` | `r` |
45+
| M68k | `reg` | `d[0-7]`, `a[0-7]` | `r` |
46+
| M68k | `reg_data` | `d[0-7]` | `d` |
47+
| M68k | `reg_addr` | `a[0-3]` | `a` |
4448

4549
> **Notes**:
4650
> - NVPTX doesn't have a fixed register set, so named registers are not supported.
@@ -70,6 +74,8 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
7074
| AVR | `reg`, `reg_upper` | None | `i8` |
7175
| AVR | `reg_pair`, `reg_iw`, `reg_ptr` | None | `i16` |
7276
| MSP430 | `reg` | None | `i8`, `i16` |
77+
| M68k | `reg`, `reg_addr` | None | `i16`, `i32` |
78+
| M68k | `reg_data` | None | `i8`, `i16`, `i32` |
7379

7480
## Register aliases
7581

@@ -88,6 +94,9 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
8894
| MSP430 | `r2` | `sr` |
8995
| MSP430 | `r3` | `cg` |
9096
| MSP430 | `r4` | `fp` |
97+
| M68k | `a5` | `bp` |
98+
| M68k | `a6` | `fp` |
99+
| M68k | `a7` | `sp`, `usp`, `ssp`, `isp` |
91100

92101
> **Notes**:
93102
> - TI does not mandate a frame pointer for MSP430, but toolchains are allowed
@@ -98,7 +107,7 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
98107
| Architecture | Unsupported register | Reason |
99108
| ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
100109
| All | `sp` | The stack pointer must be restored to its original value at the end of an asm code block. |
101-
| All | `fr` (Hexagon), `$fp` (MIPS), `Y` (AVR), `r4` (MSP430) | The frame pointer cannot be used as an input or output. |
110+
| All | `fr` (Hexagon), `$fp` (MIPS), `Y` (AVR), `r4` (MSP430), `a6` (M68k) | The frame pointer cannot be used as an input or output. |
102111
| All | `r19` (Hexagon) | This is used internally by LLVM as a "base pointer" for functions with complex stack frames. |
103112
| MIPS | `$0` or `$zero` | This is a constant zero register which can't be modified. |
104113
| MIPS | `$1` or `$at` | Reserved for assembler. |
@@ -108,6 +117,7 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
108117
| Hexagon | `lr` | This is the link register which cannot be used as an input or output. |
109118
| 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. |
110119
|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. |
120+
| M68k | `a4`, `a5` | Used internally by LLVM for the base pointer and global base pointer. |
111121

112122
## Template modifiers
113123

@@ -130,3 +140,5 @@ These flags registers must be restored upon exiting the asm block if the `preser
130140
- The status register `SREG`.
131141
- MSP430
132142
- The status register `r2`.
143+
- M68k
144+
- The condition code register `ccr`.

0 commit comments

Comments
 (0)