Skip to content

Commit 4d570fb

Browse files
committed
Removes reg aliases since there are many ABIs: o32/n32/n64
1 parent 79f477b commit 4d570fb

File tree

2 files changed

+32
-35
lines changed
  • compiler/rustc_target/src/asm
  • src/doc/unstable-book/src/library-features

2 files changed

+32
-35
lines changed

compiler/rustc_target/src/asm/mips.rs

+32-32
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,31 @@ impl MipsInlineAsmRegClass {
4545
// The reserved registers are somewhat taken from <https://git.io/JUR1k#L150>.
4646
def_regs! {
4747
Mips MipsInlineAsmReg MipsInlineAsmRegClass {
48-
v0: reg = ["$2", "$v0"],
49-
v1: reg = ["$3", "$v1"],
50-
a0: reg = ["$4", "$a0"],
51-
a1: reg = ["$5", "$a1"],
52-
a2: reg = ["$6", "$a2"],
53-
a3: reg = ["$7", "$a3"],
48+
r2: reg = ["$2"],
49+
r3: reg = ["$3"],
50+
r4: reg = ["$4"],
51+
r5: reg = ["$5"],
52+
r6: reg = ["$6"],
53+
r7: reg = ["$7"],
5454
// FIXME: Reserve $t0, $t1 if in mips16 mode.
55-
t0: reg = ["$8", "$t0"],
56-
t1: reg = ["$9", "$t1"],
57-
t2: reg = ["$10", "$t2"],
58-
t3: reg = ["$11", "$t3"],
59-
t4: reg = ["$12", "$t4"],
60-
t5: reg = ["$13", "$t5"],
61-
t6: reg = ["$14", "$t6"],
62-
t7: reg = ["$15", "$t7"],
63-
s0: reg = ["$16", "$s0"],
64-
s1: reg = ["$17", "$s1"],
65-
s2: reg = ["$18", "$s2"],
66-
s3: reg = ["$19", "$s3"],
67-
s4: reg = ["$20", "$s4"],
68-
s5: reg = ["$21", "$s5"],
69-
s6: reg = ["$22", "$s6"],
70-
s7: reg = ["$23", "$s7"],
71-
t8: reg = ["$24", "$t8"],
72-
t9: reg = ["$25", "$t9"],
55+
r8: reg = ["$8"],
56+
r9: reg = ["$9"],
57+
r10: reg = ["$10"],
58+
r11: reg = ["$11"],
59+
r12: reg = ["$12"],
60+
r13: reg = ["$13"],
61+
r14: reg = ["$14"],
62+
r15: reg = ["$15"],
63+
r16: reg = ["$16"],
64+
r17: reg = ["$17"],
65+
r18: reg = ["$18"],
66+
r19: reg = ["$19"],
67+
r20: reg = ["$20"],
68+
r21: reg = ["$21"],
69+
r22: reg = ["$22"],
70+
r23: reg = ["$23"],
71+
r24: reg = ["$24"],
72+
r25: reg = ["$25"],
7373
f0: freg = ["$f0"],
7474
f1: freg = ["$f1"],
7575
f2: freg = ["$f2"],
@@ -102,21 +102,21 @@ def_regs! {
102102
f29: freg = ["$f29"],
103103
f30: freg = ["$f30"],
104104
f31: freg = ["$f31"],
105-
#error = ["$0", "$zero"] =>
105+
#error = ["$0"] =>
106106
"constant zero cannot be used as an operand for inline asm",
107-
#error = ["$1", "$at"] =>
107+
#error = ["$1"] =>
108108
"reserved for assembler (Assembler Temp)",
109-
#error = ["$26", "$k0"] =>
109+
#error = ["$26"] =>
110110
"OS-reserved register cannot be used as an operand for inline asm",
111-
#error = ["$27", "$k1"] =>
111+
#error = ["$27"] =>
112112
"OS-reserved register cannot be used as an operand for inline asm",
113-
#error = ["$28", "$gp"] =>
113+
#error = ["$28"] =>
114114
"the global pointer cannot be used as an operand for inline asm",
115-
#error = ["$29", "$sp"] =>
115+
#error = ["$29"] =>
116116
"the stack pointer cannot be used as an operand for inline asm",
117-
#error = ["$30", "$s8", "$fp"] =>
117+
#error = ["$30"] =>
118118
"the frame pointer cannot be used as an operand for inline asm",
119-
#error = ["$31", "$ra"] =>
119+
#error = ["$31"] =>
120120
"the return address register cannot be used as an operand for inline asm",
121121
}
122122
}

src/doc/unstable-book/src/library-features/asm.md

-3
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ Some registers have multiple names. These are all treated by the compiler as ide
602602
| ARM | `r13` | `sp` |
603603
| ARM | `r14` | `lr` |
604604
| ARM | `r15` | `pc` |
605-
| MIPS32 | `$[2-25]` | Please [see the Wikipedia page][mips-regs] |
606605
| RISC-V | `x0` | `zero` |
607606
| RISC-V | `x1` | `ra` |
608607
| RISC-V | `x2` | `sp` |
@@ -623,8 +622,6 @@ Some registers have multiple names. These are all treated by the compiler as ide
623622
| Hexagon | `r30` | `fr` |
624623
| Hexagon | `r31` | `lr` |
625624

626-
[mips-regs]: https://en.wikibooks.org/wiki/MIPS_Assembly/Register_File#Registers
627-
628625
Some registers cannot be used for input or output operands:
629626

630627
| Architecture | Unsupported register | Reason |

0 commit comments

Comments
 (0)