Index: lib/Target/AArch64/AArch64InstrInfo.td =================================================================== --- lib/Target/AArch64/AArch64InstrInfo.td +++ lib/Target/AArch64/AArch64InstrInfo.td @@ -1261,6 +1261,10 @@ def STGM : MemTagVector<0, "stgm", "\t$Rt, [$Rn]", (outs), (ins GPR64:$Rt, GPR64sp:$Rn)>; +def STZGM : MemTagVector<0, "stzgm", "\t$Rt, [$Rn]", + (outs), (ins GPR64:$Rt, GPR64sp:$Rn)> { + let Inst{23} = 0; +} defm STG : MemTagStore<0b00, "stg">; defm STZG : MemTagStore<0b01, "stzg">; Index: test/MC/AArch64/armv8.5a-mte-error.s =================================================================== --- test/MC/AArch64/armv8.5a-mte-error.s +++ test/MC/AArch64/armv8.5a-mte-error.s @@ -859,3 +859,26 @@ // CHECK-NEXT: stgm #1, [x1] // CHECK: invalid operand for instruction // CHECK-NEXT: stgm x0, [#1] + +stzgm +stzgm x0 +stzgm sp, [x0] +stzgm w0, [x0] +stzgm x0, [w0] +stzgm #1, [x1] +stzgm x0, [#1] + +// CHECK: too few operands for instruction +// CHECK-NEXT: stzgm +// CHECK: too few operands for instruction +// CHECK-NEXT: stzgm x0 +// CHECK: invalid operand for instruction +// CHECK-NEXT: stzgm sp, [x0] +// CHECK: invalid operand for instruction +// CHECK-NEXT: stzgm w0, [x0] +// CHECK: invalid operand for instruction +// CHECK-NEXT: stzgm x0, [w0] +// CHECK: invalid operand for instruction +// CHECK-NEXT: stzgm #1, [x1] +// CHECK: invalid operand for instruction +// CHECK-NEXT: stzgm x0, [#1] Index: test/MC/AArch64/armv8.5a-mte.s =================================================================== --- test/MC/AArch64/armv8.5a-mte.s +++ test/MC/AArch64/armv8.5a-mte.s @@ -544,6 +544,7 @@ // NOMTE: instruction requires: mte // NOMTE: instruction requires: mte +// NOMTE: instruction requires: mte stgm x0, [x1] stgm x1, [sp] @@ -555,3 +556,16 @@ // NOMTE: instruction requires: mte // NOMTE: instruction requires: mte +// NOMTE: instruction requires: mte + +stzgm x0, [x1] +stzgm x1, [sp] +stzgm xzr, [x2] + +// CHECK: stzgm x0, [x1] // encoding: [0x20,0x00,0x20,0xd9] +// CHECK: stzgm x1, [sp] // encoding: [0xe1,0x03,0x20,0xd9] +// CHECK: stzgm xzr, [x2] // encoding: [0x5f,0x00,0x20,0xd9] + +// NOMTE: instruction requires: mte +// NOMTE: instruction requires: mte +// NOMTE: instruction requires: mte Index: test/MC/Disassembler/AArch64/armv8.5a-mte.txt =================================================================== --- test/MC/Disassembler/AArch64/armv8.5a-mte.txt +++ test/MC/Disassembler/AArch64/armv8.5a-mte.txt @@ -407,6 +407,9 @@ [0x20,0x00,0xa0,0xd9] [0xe1,0x03,0xa0,0xd9] [0x5f,0x00,0xa0,0xd9] +[0x20,0x00,0x20,0xd9] +[0xe1,0x03,0x20,0xd9] +[0x5f,0x00,0x20,0xd9] # CHECK: ldgm x0, [x1] # CHECK: ldgm x1, [sp] @@ -414,6 +417,9 @@ # CHECK: stgm x0, [x1] # CHECK: stgm x1, [sp] # CHECK: stgm xzr, [x2] +# CHECK: stzgm x0, [x1] +# CHECK: stzgm x1, [sp] +# CHECK: stzgm xzr, [x2] # NOMTE: warning: invalid instruction encoding # NOMTE-NEXT: [0x20,0x00,0xe0,0xd9] @@ -427,6 +433,12 @@ # NOMTE-NEXT: [0xe1,0x03,0xa0,0xd9] # NOMTE: warning: invalid instruction encoding # NOMTE-NEXT: [0x5f,0x00,0xa0,0xd9] +# NOMTE: warning: invalid instruction encoding +# NOMTE-NEXT: [0x20,0x00,0x20,0xd9] +# NOMTE: warning: invalid instruction encoding +# NOMTE-NEXT: [0xe1,0x03,0x20,0xd9] +# NOMTE: warning: invalid instruction encoding +# NOMTE-NEXT: [0x5f,0x00,0x20,0xd9] [0x60,0x76,0x08,0xd5] [0x81,0x76,0x08,0xd5]