Index: lib/Target/Mips/AsmParser/MipsAsmParser.cpp =================================================================== --- lib/Target/Mips/AsmParser/MipsAsmParser.cpp +++ lib/Target/Mips/AsmParser/MipsAsmParser.cpp @@ -113,6 +113,7 @@ // nullptr, which indicates that no function is currently // selected. This usually happens after an '.end func' // directive. + bool IsLittleEndian; // Print a warning along with its fix-it message at the given range. void printWarningWithFixIt(const Twine &Msg, const Twine &FixMsg, @@ -211,6 +212,9 @@ bool expandBranchImm(MCInst &Inst, SMLoc IDLoc, SmallVectorImpl &Instructions); + bool expandUlhu(MCInst &Inst, SMLoc IDLoc, + SmallVectorImpl &Instructions); + void createNop(bool hasShortDelaySlot, SMLoc IDLoc, SmallVectorImpl &Instructions); @@ -384,6 +388,13 @@ report_fatal_error("-mno-odd-spreg requires the O32 ABI"); CurrentFn = nullptr; + + Triple TheTriple(sti.getTargetTriple()); + if ((TheTriple.getArch() == Triple::mips) || + (TheTriple.getArch() == Triple::mips64)) + IsLittleEndian = false; + else + IsLittleEndian = true; } /// True if all of $fcc0 - $fcc7 exist for the current ISA. @@ -459,6 +470,8 @@ void warnIfRegIndexIsAT(unsigned RegIndex, SMLoc Loc); void warnIfNoMacro(SMLoc Loc); + + bool isLittle() const { return IsLittleEndian; } }; } @@ -1624,6 +1637,7 @@ case Mips::JalTwoReg: case Mips::BneImm: case Mips::BeqImm: + case Mips::Ulhu: return true; default: return false; @@ -1653,6 +1667,8 @@ case Mips::BneImm: case Mips::BeqImm: return expandBranchImm(Inst, IDLoc, Instructions); + case Mips::Ulhu: + return expandUlhu(Inst, IDLoc, Instructions); } } @@ -2235,6 +2251,99 @@ return false; } +bool MipsAsmParser::expandUlhu(MCInst &Inst, SMLoc IDLoc, + SmallVectorImpl &Instructions) { + if (hasMips32r6() || hasMips64r6()) { + Error(IDLoc, "instruction not supported on mips32r6 or mips64r6"); + return false; + } + + warnIfNoMacro(IDLoc); + + const MCOperand &DstRegOp = Inst.getOperand(0); + assert(DstRegOp.isReg() && "expected register operand kind"); + + const MCOperand &SrcRegOp = Inst.getOperand(1); + assert(SrcRegOp.isReg() && "expected register operand kind"); + + const MCOperand &OffsetImmOp = Inst.getOperand(2); + assert(OffsetImmOp.isImm() && "expected immediate operand kind"); + + unsigned DstReg = DstRegOp.getReg(); + unsigned SrcReg = SrcRegOp.getReg(); + int64_t OffsetValue = OffsetImmOp.getImm(); + + // NOTE: We always need AT for ULHU, as it is always used as the source + // register for one of the LBu's. + unsigned ATReg = getATReg(IDLoc); + if (!ATReg) + return true; + + // When the value of offset+1 does not fit in 16 bits, we have to load the + // offset in AT, (D)ADDu the original source register (if there was one), and + // then use AT as the source register for the 2 generated LBu's. + bool LoadedOffsetInAT = false; + if (!isInt<16>(OffsetValue + 1) || !isInt<16>(OffsetValue)) { + LoadedOffsetInAT = true; + + if (loadImmediate(OffsetValue, ATReg, Mips::NoRegister, !isGP64bit(), IDLoc, + Instructions)) + return true; + + // NOTE: We do this (D)ADDu here instead of doing it in loadImmediate() + // because it will make our output more similar to GAS'. + // NOTE: If there is no source register specified in the ULHU, the parser + // will interpret it as $0. + if (SrcReg != Mips::ZERO && SrcReg != Mips::ZERO_64) + createAddu(ATReg, ATReg, SrcReg, Instructions); + } + + unsigned FstLbuDstReg = LoadedOffsetInAT ? DstReg : ATReg; + unsigned SndLbuDstReg = LoadedOffsetInAT ? ATReg : DstReg; + unsigned LbuSrcReg = LoadedOffsetInAT ? ATReg : SrcReg; + + int64_t FstLbuOffset = 0, SndLbuOffset = 0; + if (isLittle()) { + FstLbuOffset = LoadedOffsetInAT ? 1 : (OffsetValue + 1); + SndLbuOffset = LoadedOffsetInAT ? 0 : OffsetValue; + } else { + FstLbuOffset = LoadedOffsetInAT ? 0 : OffsetValue; + SndLbuOffset = LoadedOffsetInAT ? 1 : (OffsetValue + 1); + } + + unsigned SllReg = LoadedOffsetInAT ? DstReg : ATReg; + + MCInst TmpInst; + TmpInst.setOpcode(Mips::LBu); + TmpInst.addOperand(MCOperand::createReg(FstLbuDstReg)); + TmpInst.addOperand(MCOperand::createReg(LbuSrcReg)); + TmpInst.addOperand(MCOperand::createImm(FstLbuOffset)); + Instructions.push_back(TmpInst); + + TmpInst.clear(); + TmpInst.setOpcode(Mips::LBu); + TmpInst.addOperand(MCOperand::createReg(SndLbuDstReg)); + TmpInst.addOperand(MCOperand::createReg(LbuSrcReg)); + TmpInst.addOperand(MCOperand::createImm(SndLbuOffset)); + Instructions.push_back(TmpInst); + + TmpInst.clear(); + TmpInst.setOpcode(Mips::SLL); + TmpInst.addOperand(MCOperand::createReg(SllReg)); + TmpInst.addOperand(MCOperand::createReg(SllReg)); + TmpInst.addOperand(MCOperand::createImm(8)); + Instructions.push_back(TmpInst); + + TmpInst.clear(); + TmpInst.setOpcode(Mips::OR); + TmpInst.addOperand(MCOperand::createReg(DstReg)); + TmpInst.addOperand(MCOperand::createReg(DstReg)); + TmpInst.addOperand(MCOperand::createReg(ATReg)); + Instructions.push_back(TmpInst); + + return false; +} + void MipsAsmParser::createNop(bool hasShortDelaySlot, SMLoc IDLoc, SmallVectorImpl &Instructions) { MCInst NopInst; @@ -2255,7 +2364,7 @@ unsigned TrgReg, SmallVectorImpl &Instructions) { MCInst AdduInst; - AdduInst.setOpcode(Mips::ADDu); + AdduInst.setOpcode(isGP64bit() ? Mips::DADDu : Mips::ADDu); AdduInst.addOperand(MCOperand::createReg(DstReg)); AdduInst.addOperand(MCOperand::createReg(SrcReg)); AdduInst.addOperand(MCOperand::createReg(TrgReg)); Index: lib/Target/Mips/MipsInstrInfo.td =================================================================== --- lib/Target/Mips/MipsInstrInfo.td +++ lib/Target/Mips/MipsInstrInfo.td @@ -1693,6 +1693,9 @@ "beq\t$rt, $imm64, $offset">; } +def Ulhu : MipsAsmPseudoInst<(outs GPR32Opnd:$rt), (ins mem:$addr), + "ulhu\t$rt, $addr">, ISA_MIPS1_NOT_32R6_64R6; + //===----------------------------------------------------------------------===// // Arbitrary patterns that map to one or more instructions //===----------------------------------------------------------------------===// Index: test/MC/Mips/mips-expansions-bad.s =================================================================== --- test/MC/Mips/mips-expansions-bad.s +++ test/MC/Mips/mips-expansions-bad.s @@ -18,11 +18,21 @@ la $5, symbol # N64-ONLY: :[[@LINE-1]]:3: warning: instruction loads the 32-bit address of a 64-bit symbol # N32-ONLY-NOT: :[[@LINE-2]]:3: warning: instruction loads the 32-bit address of a 64-bit symbol - # 64-BIT: lui $5, %hi(symbol) - # 64-BIT: ori $5, $5, %lo(symbol) dli $5, 1 # 32-BIT: :[[@LINE-1]]:3: error: instruction requires a 64-bit architecture bne $2, 0x100010001, 1332 # 32-BIT: :[[@LINE-1]]:3: error: instruction requires a 32-bit immediate beq $2, 0x100010001, 1332 # 32-BIT: :[[@LINE-1]]:3: error: instruction requires a 32-bit immediate + .set mips32r6 + ulhu $5, 0 + # 32-BIT: :[[@LINE-1]]:3: error: instruction not supported on mips32r6 or mips64r6 + # 64-BIT: :[[@LINE-2]]:3: error: instruction not supported on mips32r6 or mips64r6 + .set mips32 + ulhu $5, 1 + # 32-BIT-NOT: :[[@LINE-1]]:3: error: instruction not supported on mips32r6 or mips64r6 + # 64-BIT-NOT: :[[@LINE-2]]:3: error: instruction not supported on mips32r6 or mips64r6 + .set mips64r6 + ulhu $5, 2 + # 32-BIT: :[[@LINE-1]]:3: error: instruction not supported on mips32r6 or mips64r6 + # 64-BIT: :[[@LINE-2]]:3: error: instruction not supported on mips32r6 or mips64r6 Index: test/MC/Mips/mips-expansions.s =================================================================== --- test/MC/Mips/mips-expansions.s +++ test/MC/Mips/mips-expansions.s @@ -1,147 +1,349 @@ # RUN: llvm-mc %s -triple=mipsel-unknown-linux -show-encoding -mcpu=mips32r2 | \ -# RUN: FileCheck %s +# RUN: FileCheck %s --check-prefix=CHECK-LE +# RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips32r2 | \ +# RUN: FileCheck %s --check-prefix=CHECK-BE # Check that the IAS expands macro instructions in the same way as GAS. # Load immediate, done by MipsAsmParser::expandLoadImm(): li $5, 123 -# CHECK: ori $5, $zero, 123 # encoding: [0x7b,0x00,0x05,0x34] +# CHECK-LE: ori $5, $zero, 123 # encoding: [0x7b,0x00,0x05,0x34] li $6, -2345 -# CHECK: addiu $6, $zero, -2345 # encoding: [0xd7,0xf6,0x06,0x24] +# CHECK-LE: addiu $6, $zero, -2345 # encoding: [0xd7,0xf6,0x06,0x24] li $7, 65538 -# CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] -# CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] +# CHECK-LE: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] +# CHECK-LE: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] li $8, ~7 -# CHECK: addiu $8, $zero, -8 # encoding: [0xf8,0xff,0x08,0x24] +# CHECK-LE: addiu $8, $zero, -8 # encoding: [0xf8,0xff,0x08,0x24] li $9, 0x10000 -# CHECK: lui $9, 1 # encoding: [0x01,0x00,0x09,0x3c] -# CHECK-NOT: ori $9, $9, 0 # encoding: [0x00,0x00,0x29,0x35] +# CHECK-LE: lui $9, 1 # encoding: [0x01,0x00,0x09,0x3c] +# CHECK-LE-NOT: ori $9, $9, 0 # encoding: [0x00,0x00,0x29,0x35] li $10, ~(0x101010) -# CHECK: lui $10, 65519 # encoding: [0xef,0xff,0x0a,0x3c] -# CHECK: ori $10, $10, 61423 # encoding: [0xef,0xef,0x4a,0x35] +# CHECK-LE: lui $10, 65519 # encoding: [0xef,0xff,0x0a,0x3c] +# CHECK-LE: ori $10, $10, 61423 # encoding: [0xef,0xef,0x4a,0x35] # Load address, done by MipsAsmParser::expandLoadAddressReg() # and MipsAsmParser::expandLoadAddressImm(): la $4, 20 -# CHECK: ori $4, $zero, 20 # encoding: [0x14,0x00,0x04,0x34] +# CHECK-LE: ori $4, $zero, 20 # encoding: [0x14,0x00,0x04,0x34] la $7, 65538 -# CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] -# CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] +# CHECK-LE: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] +# CHECK-LE: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] la $4, 20($5) -# CHECK: ori $4, $5, 20 # encoding: [0x14,0x00,0xa4,0x34] +# CHECK-LE: ori $4, $5, 20 # encoding: [0x14,0x00,0xa4,0x34] la $7, 65538($8) -# CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] -# CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] -# CHECK: addu $7, $7, $8 # encoding: [0x21,0x38,0xe8,0x00] +# CHECK-LE: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] +# CHECK-LE: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] +# CHECK-LE: addu $7, $7, $8 # encoding: [0x21,0x38,0xe8,0x00] la $8, symbol -# CHECK: lui $8, %hi(symbol) # encoding: [A,A,0x08,0x3c] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 -# CHECK: ori $8, $8, %lo(symbol) # encoding: [A,A,0x08,0x35] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 +# CHECK-LE: lui $8, %hi(symbol) # encoding: [A,A,0x08,0x3c] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 +# CHECK-LE: ori $8, $8, %lo(symbol) # encoding: [A,A,0x08,0x35] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 # LW/SW and LDC1/SDC1 of symbol address, done by MipsAsmParser::expandMemInst(): .set noat lw $10, symbol($4) -# CHECK: lui $10, %hi(symbol) # encoding: [A,A,0x0a,0x3c] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 -# CHECK: addu $10, $10, $4 # encoding: [0x21,0x50,0x44,0x01] -# CHECK: lw $10, %lo(symbol)($10) # encoding: [A,A,0x4a,0x8d] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 +# CHECK-LE: lui $10, %hi(symbol) # encoding: [A,A,0x0a,0x3c] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 +# CHECK-LE: addu $10, $10, $4 # encoding: [0x21,0x50,0x44,0x01] +# CHECK-LE: lw $10, %lo(symbol)($10) # encoding: [A,A,0x4a,0x8d] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 .set at sw $10, symbol($9) -# CHECK: lui $1, %hi(symbol) # encoding: [A,A,0x01,0x3c] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 -# CHECK: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] -# CHECK: sw $10, %lo(symbol)($1) # encoding: [A,A,0x2a,0xac] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 +# CHECK-LE: lui $1, %hi(symbol) # encoding: [A,A,0x01,0x3c] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 +# CHECK-LE: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] +# CHECK-LE: sw $10, %lo(symbol)($1) # encoding: [A,A,0x2a,0xac] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 lw $10, 655483($4) -# CHECK: lui $10, 10 # encoding: [0x0a,0x00,0x0a,0x3c] -# CHECK: addu $10, $10, $4 # encoding: [0x21,0x50,0x44,0x01] -# CHECK: lw $10, 123($10) # encoding: [0x7b,0x00,0x4a,0x8d] +# CHECK-LE: lui $10, 10 # encoding: [0x0a,0x00,0x0a,0x3c] +# CHECK-LE: addu $10, $10, $4 # encoding: [0x21,0x50,0x44,0x01] +# CHECK-LE: lw $10, 123($10) # encoding: [0x7b,0x00,0x4a,0x8d] sw $10, 123456($9) -# CHECK: lui $1, 2 # encoding: [0x02,0x00,0x01,0x3c] -# CHECK: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] -# CHECK: sw $10, 57920($1) # encoding: [0x40,0xe2,0x2a,0xac] +# CHECK-LE: lui $1, 2 # encoding: [0x02,0x00,0x01,0x3c] +# CHECK-LE: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] +# CHECK-LE: sw $10, 57920($1) # encoding: [0x40,0xe2,0x2a,0xac] lw $8, symbol -# CHECK: lui $8, %hi(symbol) # encoding: [A,A,0x08,0x3c] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 -# CHECK-NOT: move $8, $8 # encoding: [0x21,0x40,0x00,0x01] -# CHECK: lw $8, %lo(symbol)($8) # encoding: [A,A,0x08,0x8d] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 +# CHECK-LE: lui $8, %hi(symbol) # encoding: [A,A,0x08,0x3c] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 +# CHECK-LE-NOT: move $8, $8 # encoding: [0x21,0x40,0x00,0x01] +# CHECK-LE: lw $8, %lo(symbol)($8) # encoding: [A,A,0x08,0x8d] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 sw $8, symbol -# CHECK: lui $1, %hi(symbol) # encoding: [A,A,0x01,0x3c] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 -# CHECK-NOT: move $1, $1 # encoding: [0x21,0x08,0x20,0x00] -# CHECK: sw $8, %lo(symbol)($1) # encoding: [A,A,0x28,0xac] -# CHECK: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 +# CHECK-LE: lui $1, %hi(symbol) # encoding: [A,A,0x01,0x3c] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_HI, kind: fixup_Mips_HI16 +# CHECK-LE-NOT: move $1, $1 # encoding: [0x21,0x08,0x20,0x00] +# CHECK-LE: sw $8, %lo(symbol)($1) # encoding: [A,A,0x28,0xac] +# CHECK-LE: # fixup A - offset: 0, value: symbol@ABS_LO, kind: fixup_Mips_LO16 ldc1 $f0, symbol -# CHECK: lui $1, %hi(symbol) -# CHECK: ldc1 $f0, %lo(symbol)($1) +# CHECK-LE: lui $1, %hi(symbol) +# CHECK-LE: ldc1 $f0, %lo(symbol)($1) sdc1 $f0, symbol -# CHECK: lui $1, %hi(symbol) -# CHECK: sdc1 $f0, %lo(symbol)($1) +# CHECK-LE: lui $1, %hi(symbol) +# CHECK-LE: sdc1 $f0, %lo(symbol)($1) # Test BNE with an immediate as the 2nd operand. bne $2, 0, 1332 -# CHECK: bnez $2, 1332 # encoding: [0x4d,0x01,0x40,0x14] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: bnez $2, 1332 # encoding: [0x4d,0x01,0x40,0x14] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] bne $2, 123, 1332 -# CHECK: ori $1, $zero, 123 # encoding: [0x7b,0x00,0x01,0x34] -# CHECK: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: ori $1, $zero, 123 # encoding: [0x7b,0x00,0x01,0x34] +# CHECK-LE: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] bne $2, -2345, 1332 -# CHECK: addiu $1, $zero, -2345 # encoding: [0xd7,0xf6,0x01,0x24] -# CHECK: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: addiu $1, $zero, -2345 # encoding: [0xd7,0xf6,0x01,0x24] +# CHECK-LE: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] bne $2, 65538, 1332 -# CHECK: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] -# CHECK: ori $1, $1, 2 # encoding: [0x02,0x00,0x21,0x34] -# CHECK: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK-LE: ori $1, $1, 2 # encoding: [0x02,0x00,0x21,0x34] +# CHECK-LE: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] bne $2, ~7, 1332 -# CHECK: addiu $1, $zero, -8 # encoding: [0xf8,0xff,0x01,0x24] -# CHECK: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: addiu $1, $zero, -8 # encoding: [0xf8,0xff,0x01,0x24] +# CHECK-LE: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] bne $2, 0x10000, 1332 -# CHECK: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] -# CHECK: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK-LE: bne $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x14] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] # Test BEQ with an immediate as the 2nd operand. beq $2, 0, 1332 -# CHECK: beqz $2, 1332 # encoding: [0x4d,0x01,0x40,0x10] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: beqz $2, 1332 # encoding: [0x4d,0x01,0x40,0x10] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] beq $2, 123, 1332 -# CHECK: ori $1, $zero, 123 # encoding: [0x7b,0x00,0x01,0x34] -# CHECK: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: ori $1, $zero, 123 # encoding: [0x7b,0x00,0x01,0x34] +# CHECK-LE: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] beq $2, -2345, 1332 -# CHECK: addiu $1, $zero, -2345 # encoding: [0xd7,0xf6,0x01,0x24] -# CHECK: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: addiu $1, $zero, -2345 # encoding: [0xd7,0xf6,0x01,0x24] +# CHECK-LE: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] beq $2, 65538, 1332 -# CHECK: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] -# CHECK: ori $1, $1, 2 # encoding: [0x02,0x00,0x21,0x34] -# CHECK: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK-LE: ori $1, $1, 2 # encoding: [0x02,0x00,0x21,0x34] +# CHECK-LE: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] beq $2, ~7, 1332 -# CHECK: addiu $1, $zero, -8 # encoding: [0xf8,0xff,0x01,0x24] -# CHECK: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: addiu $1, $zero, -8 # encoding: [0xf8,0xff,0x01,0x24] +# CHECK-LE: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] beq $2, 0x10000, 1332 -# CHECK: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] -# CHECK: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] -# CHECK: nop # encoding: [0x00,0x00,0x00,0x00] +# CHECK-LE: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK-LE: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] +# CHECK-LE: nop # encoding: [0x00,0x00,0x00,0x00] + +# Test ULHU with immediate operand. + ulhu $8, 0 +# CHECK-BE: lbu $1, 0($zero) # encoding: [0x90,0x01,0x00,0x00] +# CHECK-BE: lbu $8, 1($zero) # encoding: [0x90,0x08,0x00,0x01] +# CHECK-BE: sll $1, $1, 8 # encoding: [0x00,0x01,0x0a,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lbu $1, 1($zero) # encoding: [0x01,0x00,0x01,0x90] +# CHECK-LE: lbu $8, 0($zero) # encoding: [0x00,0x00,0x08,0x90] +# CHECK-LE: sll $1, $1, 8 # encoding: [0x00,0x0a,0x01,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 2 +# CHECK-BE: lbu $1, 2($zero) # encoding: [0x90,0x01,0x00,0x02] +# CHECK-BE: lbu $8, 3($zero) # encoding: [0x90,0x08,0x00,0x03] +# CHECK-BE: sll $1, $1, 8 # encoding: [0x00,0x01,0x0a,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lbu $1, 3($zero) # encoding: [0x03,0x00,0x01,0x90] +# CHECK-LE: lbu $8, 2($zero) # encoding: [0x02,0x00,0x08,0x90] +# CHECK-LE: sll $1, $1, 8 # encoding: [0x00,0x0a,0x01,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 0x8000 +# CHECK-BE: ori $1, $zero, 32768 # encoding: [0x34,0x01,0x80,0x00] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: ori $1, $zero, 32768 # encoding: [0x00,0x80,0x01,0x34] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, -0x8000 +# CHECK-BE: lbu $1, -32768($zero) # encoding: [0x90,0x01,0x80,0x00] +# CHECK-BE: lbu $8, -32767($zero) # encoding: [0x90,0x08,0x80,0x01] +# CHECK-BE: sll $1, $1, 8 # encoding: [0x00,0x01,0x0a,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lbu $1, -32767($zero) # encoding: [0x01,0x80,0x01,0x90] +# CHECK-LE: lbu $8, -32768($zero) # encoding: [0x00,0x80,0x08,0x90] +# CHECK-LE: sll $1, $1, 8 # encoding: [0x00,0x0a,0x01,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 0x10000 +# CHECK-BE: lui $1, 1 # encoding: [0x3c,0x01,0x00,0x01] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 0x18888 +# CHECK-BE: lui $1, 1 # encoding: [0x3c,0x01,0x00,0x01] +# CHECK-BE: ori $1, $1, 34952 # encoding: [0x34,0x21,0x88,0x88] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK-LE: ori $1, $1, 34952 # encoding: [0x88,0x88,0x21,0x34] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, -32769 +# CHECK-BE: lui $1, 65535 # encoding: [0x3c,0x01,0xff,0xff] +# CHECK-BE: ori $1, $1, 32767 # encoding: [0x34,0x21,0x7f,0xff] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lui $1, 65535 # encoding: [0xff,0xff,0x01,0x3c] +# CHECK-LE: ori $1, $1, 32767 # encoding: [0xff,0x7f,0x21,0x34] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 32767 +# CHECK-BE: ori $1, $zero, 32767 # encoding: [0x34,0x01,0x7f,0xff] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: ori $1, $zero, 32767 # encoding: [0xff,0x7f,0x01,0x34] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + +# Test ULHU with immediate offset and a source register operand. + ulhu $8, 0($9) +# CHECK-BE: lbu $1, 0($9) # encoding: [0x91,0x21,0x00,0x00] +# CHECK-BE: lbu $8, 1($9) # encoding: [0x91,0x28,0x00,0x01] +# CHECK-BE: sll $1, $1, 8 # encoding: [0x00,0x01,0x0a,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lbu $1, 1($9) # encoding: [0x01,0x00,0x21,0x91] +# CHECK-LE: lbu $8, 0($9) # encoding: [0x00,0x00,0x28,0x91] +# CHECK-LE: sll $1, $1, 8 # encoding: [0x00,0x0a,0x01,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 2($9) +# CHECK-BE: lbu $1, 2($9) # encoding: [0x91,0x21,0x00,0x02] +# CHECK-BE: lbu $8, 3($9) # encoding: [0x91,0x28,0x00,0x03] +# CHECK-BE: sll $1, $1, 8 # encoding: [0x00,0x01,0x0a,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lbu $1, 3($9) # encoding: [0x03,0x00,0x21,0x91] +# CHECK-LE: lbu $8, 2($9) # encoding: [0x02,0x00,0x28,0x91] +# CHECK-LE: sll $1, $1, 8 # encoding: [0x00,0x0a,0x01,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 0x8000($9) +# CHECK-BE: ori $1, $zero, 32768 # encoding: [0x34,0x01,0x80,0x00] +# CHECK-BE: addu $1, $1, $9 # encoding: [0x00,0x29,0x08,0x21] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: ori $1, $zero, 32768 # encoding: [0x00,0x80,0x01,0x34] +# CHECK-LE: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, -0x8000($9) +# CHECK-BE: lbu $1, -32768($9) # encoding: [0x91,0x21,0x80,0x00] +# CHECK-BE: lbu $8, -32767($9) # encoding: [0x91,0x28,0x80,0x01] +# CHECK-BE: sll $1, $1, 8 # encoding: [0x00,0x01,0x0a,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lbu $1, -32767($9) # encoding: [0x01,0x80,0x21,0x91] +# CHECK-LE: lbu $8, -32768($9) # encoding: [0x00,0x80,0x28,0x91] +# CHECK-LE: sll $1, $1, 8 # encoding: [0x00,0x0a,0x01,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 0x10000($9) +# CHECK-BE: lui $1, 1 # encoding: [0x3c,0x01,0x00,0x01] +# CHECK-BE: addu $1, $1, $9 # encoding: [0x00,0x29,0x08,0x21] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK-LE: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 0x18888($9) +# CHECK-BE: lui $1, 1 # encoding: [0x3c,0x01,0x00,0x01] +# CHECK-BE: ori $1, $1, 34952 # encoding: [0x34,0x21,0x88,0x88] +# CHECK-BE: addu $1, $1, $9 # encoding: [0x00,0x29,0x08,0x21] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK-LE: ori $1, $1, 34952 # encoding: [0x88,0x88,0x21,0x34] +# CHECK-LE: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, -32769($9) +# CHECK-BE: lui $1, 65535 # encoding: [0x3c,0x01,0xff,0xff] +# CHECK-BE: ori $1, $1, 32767 # encoding: [0x34,0x21,0x7f,0xff] +# CHECK-BE: addu $1, $1, $9 # encoding: [0x00,0x29,0x08,0x21] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: lui $1, 65535 # encoding: [0xff,0xff,0x01,0x3c] +# CHECK-LE: ori $1, $1, 32767 # encoding: [0xff,0x7f,0x21,0x34] +# CHECK-LE: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 32767($9) +# CHECK-BE: ori $1, $zero, 32767 # encoding: [0x34,0x01,0x7f,0xff] +# CHECK-BE: addu $1, $1, $9 # encoding: [0x00,0x29,0x08,0x21] +# CHECK-BE: lbu $8, 0($1) # encoding: [0x90,0x28,0x00,0x00] +# CHECK-BE: lbu $1, 1($1) # encoding: [0x90,0x21,0x00,0x01] +# CHECK-BE: sll $8, $8, 8 # encoding: [0x00,0x08,0x42,0x00] +# CHECK-BE: or $8, $8, $1 # encoding: [0x01,0x01,0x40,0x25] +# CHECK-LE: ori $1, $zero, 32767 # encoding: [0xff,0x7f,0x01,0x34] +# CHECK-LE: addu $1, $1, $9 # encoding: [0x21,0x08,0x29,0x00] +# CHECK-LE: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK-LE: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK-LE: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK-LE: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] Index: test/MC/Mips/mips64-expansions.s =================================================================== --- test/MC/Mips/mips64-expansions.s +++ test/MC/Mips/mips64-expansions.s @@ -271,3 +271,101 @@ # CHECK: ori $1, $1, 65535 # encoding: [0xff,0xff,0x21,0x34] # CHECK: beq $2, $1, 1332 # encoding: [0x4d,0x01,0x41,0x10] # CHECK: nop # encoding: [0x00,0x00,0x00,0x00] + +# Test ulhu with 64-bit immediate addresses. + ulhu $8, 0x100010001 +# CHECK: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 0x1000100010001 +# CHECK: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, -0x100010001 +# CHECK: lui $1, 65535 # encoding: [0xff,0xff,0x01,0x3c] +# CHECK: ori $1, $1, 65534 # encoding: [0xfe,0xff,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 65534 # encoding: [0xfe,0xff,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 65535 # encoding: [0xff,0xff,0x21,0x34] +# CHECK: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, -0x1000100010001 +# CHECK: lui $1, 65534 # encoding: [0xfe,0xff,0x01,0x3c] +# CHECK: ori $1, $1, 65534 # encoding: [0xfe,0xff,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 65534 # encoding: [0xfe,0xff,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 65535 # encoding: [0xff,0xff,0x21,0x34] +# CHECK: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + +# Test ulhu with source register and 64-bit immediate offset. + ulhu $8, 0x100010001($9) +# CHECK: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: daddu $1, $1, $9 # encoding: [0x2d,0x08,0x29,0x00] +# CHECK: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, 0x1000100010001($9) +# CHECK: lui $1, 1 # encoding: [0x01,0x00,0x01,0x3c] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 1 # encoding: [0x01,0x00,0x21,0x34] +# CHECK: daddu $1, $1, $9 # encoding: [0x2d,0x08,0x29,0x00] +# CHECK: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, -0x100010001($9) +# CHECK: lui $1, 65535 # encoding: [0xff,0xff,0x01,0x3c] +# CHECK: ori $1, $1, 65534 # encoding: [0xfe,0xff,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 65534 # encoding: [0xfe,0xff,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 65535 # encoding: [0xff,0xff,0x21,0x34] +# CHECK: daddu $1, $1, $9 # encoding: [0x2d,0x08,0x29,0x00] +# CHECK: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] + + ulhu $8, -0x1000100010001($9) +# CHECK: lui $1, 65534 # encoding: [0xfe,0xff,0x01,0x3c] +# CHECK: ori $1, $1, 65534 # encoding: [0xfe,0xff,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 65534 # encoding: [0xfe,0xff,0x21,0x34] +# CHECK: dsll $1, $1, 16 # encoding: [0x38,0x0c,0x01,0x00] +# CHECK: ori $1, $1, 65535 # encoding: [0xff,0xff,0x21,0x34] +# CHECK: daddu $1, $1, $9 # encoding: [0x2d,0x08,0x29,0x00] +# CHECK: lbu $8, 1($1) # encoding: [0x01,0x00,0x28,0x90] +# CHECK: lbu $1, 0($1) # encoding: [0x00,0x00,0x21,0x90] +# CHECK: sll $8, $8, 8 # encoding: [0x00,0x42,0x08,0x00] +# CHECK: or $8, $8, $1 # encoding: [0x25,0x40,0x01,0x01] Index: test/MC/Mips/set-nomacro.s =================================================================== --- test/MC/Mips/set-nomacro.s +++ test/MC/Mips/set-nomacro.s @@ -20,6 +20,8 @@ beq $2, 0, 1332 beq $2, 1, 1332 + ulhu $5, 0 + add $4, $5, $6 .set noreorder @@ -54,6 +56,8 @@ beq $2, 0, 1332 # CHECK-NOT: [[@LINE-1]]:3: warning: macro instruction expanded into multiple instructions beq $2, 1, 1332 + + ulhu $5, 0 # CHECK: [[@LINE-1]]:3: warning: macro instruction expanded into multiple instructions add $4, $5, $6