|| AddrMode == ARMII::AddrModeT2_so // SP can't be used as based register
|| AddrMode == ARMII::AddrModeT2_pc // PCrel access
|| AddrMode == ARMII::AddrMode2 // Used by PRE and POST indexed LD/ST
+ || AddrMode == ARMII::AddrModeT2_i7 // v8.1-M MVE
+ || AddrMode == ARMII::AddrModeT2_i7s2 // v8.1-M MVE
+ || AddrMode == ARMII::AddrModeT2_i7s4 // v8.1-M sys regs VLDR/VSTR
|| AddrMode == ARMII::AddrModeNone)
return false;
NumBits = 8;
break;
case ARMII::AddrModeT2_i8s4:
+ // FIXME: Values are already scaled in this addressing mode.
+ assert((Fixup & 3) == 0 && "Can't encode this offset!");
+ NumBits = 10;
+ break;
case ARMII::AddrModeT2_ldrex:
NumBits = 8;
Scale = 4;
case ARMII::AddrMode_i12:
NumBits = 12;
break;
- case ARMII::AddrModeT2_i7:
- NumBits = 7;
- break;
- case ARMII::AddrModeT2_i7s2:
- NumBits = 7;
- Scale = 2;
- break;
- case ARMII::AddrModeT2_i7s4:
- NumBits = 7;
- Scale = 4;
- break;
case ARMII::AddrModeT1_s: // SP-relative LD/ST
NumBits = 8;
Scale = 4;
}
// Make sure the offset is encodable for instructions that scale the
// immediate.
- if (((OffVal * Scale + Fixup) & (Scale - 1)) != 0)
- return false;
+ assert(((OffVal * Scale + Fixup) & (Scale - 1)) == 0 &&
+ "Can't encode this offset!");
OffVal += Fixup / Scale;
unsigned Mask = (1 << NumBits) - 1;
;CHECK-LABEL: name: CheckAddrModeT2_i8s4
;CHECK: $r0 = tMOVr $r1, 14 /* CC::al */, $noreg
;CHECK-NEXT: tBL 14 /* CC::al */, $noreg, @OUTLINED_FUNCTION_[[I8S4:[0-9]+]]
- ;CHECK-NEXT: t2STRDi8 $r0, $r1, $sp, 254, 14 /* CC::al */, $noreg
+ ;CHECK-NEXT: t2STRDi8 $r0, $r1, $sp, 1020, 14 /* CC::al */, $noreg
$r0 = tMOVr $r1, 14, $noreg
tBL 14, $noreg, @foo, implicit-def dead $lr, implicit $sp
t2STRDi8 $r0, $r1, $sp, 0, 14, $noreg
t2STRDi8 $r0, $r1, $sp, 8, 14, $noreg
- t2STRDi8 $r0, $r1, $sp, 253, 14, $noreg
- t2STRDi8 $r0, $r1, $sp, 254, 14, $noreg
+ t2STRDi8 $r0, $r1, $sp, 1012, 14, $noreg
+ t2STRDi8 $r0, $r1, $sp, 1020, 14, $noreg
tBL 14, $noreg, @foo, implicit-def dead $lr, implicit $sp
t2STRDi8 $r0, $r1, $sp, 0, 14, $noreg
t2STRDi8 $r0, $r1, $sp, 8, 14, $noreg
- t2STRDi8 $r0, $r1, $sp, 253, 14, $noreg
- t2STRDi8 $r0, $r1, $sp, 254, 14, $noreg
+ t2STRDi8 $r0, $r1, $sp, 1012, 14, $noreg
+ t2STRDi8 $r0, $r1, $sp, 1020, 14, $noreg
tBL 14, $noreg, @foo, implicit-def dead $lr, implicit $sp
t2STRDi8 $r0, $r1, $sp, 0, 14, $noreg
t2STRDi8 $r0, $r1, $sp, 8, 14, $noreg
- t2STRDi8 $r0, $r1, $sp, 253, 14, $noreg
- t2STRDi8 $r0, $r1, $sp, 254, 14, $noreg
+ t2STRDi8 $r0, $r1, $sp, 1012, 14, $noreg
+ t2STRDi8 $r0, $r1, $sp, 1020, 14, $noreg
BX_RET 14, $noreg
...
---
;CHECK-NEXT: frame-setup CFI_INSTRUCTION def_cfa_offset 8
;CHECK-NEXT: frame-setup CFI_INSTRUCTION offset $lr, -8
;CHECK-NEXT: tBL 14 /* CC::al */, $noreg, @foo, implicit-def dead $lr, implicit $sp
- ;CHECK-NEXT: t2STRDi8 $r0, $r1, $sp, 2, 14 /* CC::al */, $noreg
- ;CHECK-NEXT: t2STRDi8 $r0, $r1, $sp, 10, 14 /* CC::al */, $noreg
- ;CHECK-NEXT: t2STRDi8 $r0, $r1, $sp, 255, 14 /* CC::al */, $noreg
+ ;CHECK-NEXT: t2STRDi8 $r0, $r1, $sp, 8, 14 /* CC::al */, $noreg
+ ;CHECK-NEXT: t2STRDi8 $r0, $r1, $sp, 16, 14 /* CC::al */, $noreg
+ ;CHECK-NEXT: t2STRDi8 $r0, $r1, $sp, 1020, 14 /* CC::al */, $noreg
;CHECK-NEXT: $lr, $sp = t2LDR_POST $sp, 8, 14 /* CC::al */, $noreg
;CHECK: name: OUTLINED_FUNCTION_[[I12]]