[M68k] Add addressing modes ARIPI and ARIPD support for BTST

[Jim]

Summary

BTST missed ARIPI and ARIPD addressing modes support.

[Jim]

Rebase

[Jim]

Rebase

[ricky26]

Style is fine, tests run clean for me.

llvm/test/MC/M68k/Bits/Classes/MxBTST_MI.s

15

I'm not sure whether this is defined behaviour. The spec I have says that BTST with a register for the bit number wraps, but doesn't specify that behaviour for the immediate mode, so it probably works. Additionally, I don't think it would be signed, but again, I suspect it'll still work (-1 will be interpreted as 31).

[myhsu]

This revision seems to be in conflict with D116993 . How are you going to resolve it? (e.g. rebasing this one on top of D116993 and setup a dependency)

[Jim]

In D116580#3247458, @myhsu wrote:

This revision seems to be in conflict with D116993 . How are you going to resolve it? (e.g. rebasing this one on top of D116993 and setup a dependency)

This revision is parent of D116993. It doesn't depend on D116993. I am going to resolve issue in D116993 you mentioned.

[Jim]

llvm/test/MC/M68k/Bits/Classes/MxBTST_MI.s

15

The spec for BTST mentioned When a data register is the destination, any of the 32 bits can be specified by a modulo 32- bit number. When a memory location is the destination, the operation is a byte operation, and the bit number is modulo 8.

Maybe have another revision to forbid signed number as immediate operand in the future.

The reference spec: https://www.nxp.com/files-static/archives/doc/ref_manual/M68000PRM.pdf

[Jim]

Kindly ping.

[myhsu]

In D116580#3257039, @Jim wrote:

In D116580#3247458, @myhsu wrote:

This revision seems to be in conflict with D116993 . How are you going to resolve it? (e.g. rebasing this one on top of D116993 and setup a dependency)

This revision is parent of D116993. It doesn't depend on D116993. I am going to resolve issue in D116993 you mentioned.

Sorry I missed this comment. LGTM now

llvm/test/MC/M68k/Bits/Classes/MxBTST_MI.s

15

Maybe have another revision to forbid signed number as immediate operand in the future.

GNU AS currently supports negative immediate so I'm incline not to remove this feature.

llvm/lib/Target/M68k/M68kInstrBits.td

 
 // Register BTST limited to 32 bits only
 def BTST32dd : MxBTST_RR<MxType32d>;
 def BTST32di : MxBTST_RI<MxType32d>;
 
 // Memory BTST limited to 8 bits only
 def BTST8jd : MxBTST_MR<MxType8d, MxType8.JOp, MxType8.JPat,
                         MxEncEAj_0, MxExtEmpty>;
+def BTST8od : MxBTST_MR<MxType8d, MxType8.OOp, MxType8.OPat,
+                        MxEncEAo_0, MxExtEmpty>;
+def BTST8ed : MxBTST_MR<MxType8d, MxType8.EOp, MxType8.EPat,
+                        MxEncEAe_0, MxExtEmpty>;
 def BTST8pd : MxBTST_MR<MxType8d, MxType8.POp, MxType8.PPat,
                         MxEncEAp_0, MxExtI16_0>;
 def BTST8fd : MxBTST_MR<MxType8d, MxType8.FOp, MxType8.FPat,
                         MxEncEAf_0, MxExtBrief_0>;
 def BTST8qd : MxBTST_MR<MxType8d, MxType8.QOp, MxType8.QPat,
                         MxEncEAq,   MxExtI16_0>;
 def BTST8kd : MxBTST_MR<MxType8d, MxType8.KOp, MxType8.KPat,
                         MxEncEAk,   MxExtBrief_0>;
 
 def BTST8ji : MxBTST_MI<MxType8d, MxType8.JOp, MxType8.JPat,
                         MxEncEAj_0, MxExtEmpty>;
+def BTST8oi : MxBTST_MI<MxType8d, MxType8.OOp, MxType8.OPat,
+                        MxEncEAo_0, MxExtEmpty>;
+def BTST8ei : MxBTST_MI<MxType8d, MxType8.EOp, MxType8.EPat,
+                        MxEncEAe_0, MxExtEmpty>;
 def BTST8pi : MxBTST_MI<MxType8d, MxType8.POp, MxType8.PPat,
                         MxEncEAp_0, MxExtI16_0>;
 def BTST8fi : MxBTST_MI<MxType8d, MxType8.FOp, MxType8.FPat,
                         MxEncEAf_0, MxExtBrief_0>;
 def BTST8qi : MxBTST_MI<MxType8d, MxType8.QOp, MxType8.QPat,
                         MxEncEAq,   MxExtI16_0>;
 def BTST8ki : MxBTST_MI<MxType8d, MxType8.KOp, MxType8.KPat,
                         MxEncEAk,   MxExtBrief_0>;

llvm/test/MC/M68k/Bits/Classes/MxBTST_MI.s

 ; RUN: llvm-mc -triple=m68k -show-encoding %s | FileCheck %s
 
 ; CHECK:      btst  #0, (-1,%pc,%d1)
 ; CHECK-SAME: encoding: [0x08,0x3b,0x00,0x00,0x18,0xff]
 btst  #0, (-1,%pc,%d1)
 ; CHECK:      btst  #1, (0,%pc,%d0)
 ; CHECK-SAME: encoding: [0x08,0x3b,0x00,0x01,0x08,0x00]
 btst  #1, (0,%pc,%d0)
 
 ; CHECK:      btst  #0, (0,%pc)
 ; CHECK-SAME: encoding: [0x08,0x3a,0x00,0x00,0x00,0x00]
 btst  #0, (0,%pc)
 ; CHECK:      btst  #-1, (-1,%pc)
 ; CHECK-SAME: encoding: [0x08,0x3a,0x00,0xff,0xff,0xff]
 btst  #-1, (-1,%pc)
 
 ; CHECK:      btst  #0, (-1,%a1,%a0)
 ; CHECK-SAME: encoding: [0x08,0x31,0x00,0x00,0x88,0xff]
 btst  #0, (-1,%a1,%a0)
 ; CHECK:      btst  #-1, (0,%a0,%a0)
 ; CHECK-SAME: encoding: [0x08,0x30,0x00,0xff,0x88,0x00]
 btst  #-1, (0,%a0,%a0)
 
 ; CHECK:      btst  #0, (-1,%a1)
 ; CHECK-SAME: encoding: [0x08,0x29,0x00,0x00,0xff,0xff]
 btst  #0, (-1,%a1)
 ; CHECK:      btst  #-1, (0,%a0)
 ; CHECK-SAME: encoding: [0x08,0x28,0x00,0xff,0x00,0x00]
 btst  #-1, (0,%a0)
 
 ; CHECK:      btst  #0, (%a1)
 ; CHECK-SAME: encoding: [0x08,0x11,0x00,0x00]
 btst  #0, (%a1)
 ; CHECK:      btst  #-1, (%a0)
 ; CHECK-SAME: encoding: [0x08,0x10,0x00,0xff]
 btst  #-1, (%a0)
 
+; CHECK:      btst  #0, (%a1)+
+; CHECK-SAME: encoding: [0x08,0x19,0x00,0x00]
+btst  #0, (%a1)+
+; CHECK:      btst  #-1, (%a0)+
+; CHECK-SAME: encoding: [0x08,0x18,0x00,0xff]
+btst  #-1, (%a0)+
+
+; CHECK:      btst  #0, -(%a1)
+; CHECK-SAME: encoding: [0x08,0x21,0x00,0x00]
+btst  #0, -(%a1)
+; CHECK:      btst  #-1, -(%a0)
+; CHECK-SAME: encoding: [0x08,0x20,0x00,0xff]
+btst  #-1, -(%a0)

llvm/test/MC/M68k/Bits/Classes/MxBTST_MR.s

 
 ; CHECK:      btst  %d0, (%a1)
 ; CHECK-SAME: encoding: [0x01,0x11]
 btst  %d0, (%a1)
 ; CHECK:      btst  %d1, (%a0)
 ; CHECK-SAME: encoding: [0x03,0x10]
 btst  %d1, (%a0)
 
+; CHECK:      btst  %d0, (%a1)+
+; CHECK-SAME: encoding: [0x01,0x19]
+btst  %d0, (%a1)+
+; CHECK:      btst  %d1, (%a0)+
+; CHECK-SAME: encoding: [0x03,0x18]
+btst  %d1, (%a0)+
+
+; CHECK:      btst  %d0, -(%a1)
+; CHECK-SAME: encoding: [0x01,0x21]
+btst  %d0, -(%a1)
+; CHECK:      btst  %d1, -(%a0)
+; CHECK-SAME: encoding: [0x03,0x20]
+btst  %d1, -(%a0)