diff --git a/test/MC/Disassembler/ARM/arm-tests.txt b/test/MC/Disassembler/ARM/arm-tests.txt index 69a094dd681..36627a34881 100644 --- a/test/MC/Disassembler/ARM/arm-tests.txt +++ b/test/MC/Disassembler/ARM/arm-tests.txt @@ -161,12 +161,6 @@ # CHECK: cpsie if, #10 0xca 0x00 0x0a 0xf1 -# CHECK: msr CPSR_fc, r0 -0x00 0xf0 0x29 0xe1 - -# CHECK: msrmi CPSR_c, #4043309056 -0xf1 0xf4 0x21 0x43 - # CHECK: rsbs r6, r7, r8 0x08 0x60 0x77 0xe0 diff --git a/test/MC/Disassembler/ARM/basic-arm-instructions.txt b/test/MC/Disassembler/ARM/basic-arm-instructions.txt index fc7eda537ab..06aa8f756da 100644 --- a/test/MC/Disassembler/ARM/basic-arm-instructions.txt +++ b/test/MC/Disassembler/ARM/basic-arm-instructions.txt @@ -744,65 +744,21 @@ # MSR #------------------------------------------------------------------------------ -# CHECK: msr CPSR_fc, #5 -# CHECK: msr APSR_g, #5 -# CHECK: msr APSR_nzcvq, #5 -# CHECK: msr APSR_nzcvq, #5 -# CHECK: msr APSR_nzcvqg, #5 -# CHECK: msr CPSR_fc, #5 # CHECK: msr CPSR_c, #5 # CHECK: msr CPSR_x, #5 -# CHECK: msr CPSR_fc, #5 -# CHECK: msr CPSR_fc, #5 -# CHECK: msr CPSR_fsx, #5 -# CHECK: msr SPSR_fc, #5 -# CHECK: msr SPSR_fsxc, #5 -# CHECK: msr CPSR_fsxc, #5 +# CHECK: msr CPSR_xc, #5 -0x05 0xf0 0x29 0xe3 0x05 0xf0 0x24 0xe3 0x05 0xf0 0x28 0xe3 -0x05 0xf0 0x28 0xe3 0x05 0xf0 0x2c 0xe3 -0x05 0xf0 0x29 0xe3 -0x05 0xf0 0x21 0xe3 -0x05 0xf0 0x22 0xe3 -0x05 0xf0 0x29 0xe3 -0x05 0xf0 0x29 0xe3 -0x05 0xf0 0x2e 0xe3 -0x05 0xf0 0x69 0xe3 -0x05 0xf0 0x6f 0xe3 -0x05 0xf0 0x2f 0xe3 -# CHECK: msr CPSR_fc, r0 -# CHECK: msr APSR_g, r0 -# CHECK: msr APSR_nzcvq, r0 -# CHECK: msr APSR_nzcvq, r0 -# CHECK: msr APSR_nzcvqg, r0 -# CHECK: msr CPSR_fc, r0 # CHECK: msr CPSR_c, r0 # CHECK: msr CPSR_x, r0 -# CHECK: msr CPSR_fc, r0 -# CHECK: msr CPSR_fc, r0 -# CHECK: msr CPSR_fsx, r0 -# CHECK: msr SPSR_fc, r0 -# CHECK: msr SPSR_fsxc, r0 -# CHECK: msr CPSR_fsxc, r0 +# CHECK: msr CPSR_xc, r0 -0x00 0xf0 0x29 0xe1 0x00 0xf0 0x24 0xe1 0x00 0xf0 0x28 0xe1 -0x00 0xf0 0x28 0xe1 0x00 0xf0 0x2c 0xe1 -0x00 0xf0 0x29 0xe1 -0x00 0xf0 0x21 0xe1 -0x00 0xf0 0x22 0xe1 -0x00 0xf0 0x29 0xe1 -0x00 0xf0 0x29 0xe1 -0x00 0xf0 0x2e 0xe1 -0x00 0xf0 0x69 0xe1 -0x00 0xf0 0x6f 0xe1 -0x00 0xf0 0x2f 0xe1 #------------------------------------------------------------------------------ # MUL