| Index: src/IceAssemblerARM32.cpp
|
| diff --git a/src/IceAssemblerARM32.cpp b/src/IceAssemblerARM32.cpp
|
| index 598146cad583fc35862d02a422d3b52661307295..aa1121480c4a7b986fb92105bd815adbb5df9457 100644
|
| --- a/src/IceAssemblerARM32.cpp
|
| +++ b/src/IceAssemblerARM32.cpp
|
| @@ -261,10 +261,8 @@ void ARM32::AssemblerARM32::emitTextInst(const std::string &Text,
|
| void ARM32::AssemblerARM32::emitType01(CondARM32::Cond Cond, uint32_t Type,
|
| uint32_t Opcode, bool SetCc, uint32_t Rn,
|
| uint32_t Rd, uint32_t Imm12) {
|
| - assert(isGPRRegisterDefined(Rd));
|
| - // TODO(kschimpf): Remove void cast when MINIMAL build allows.
|
| - (void)isGPRRegisterDefined(Rd);
|
| - assert(Cond != CondARM32::kNone);
|
| + if (!isGPRRegisterDefined(Rd) || !isConditionDefined(Cond))
|
| + return setNeedsTextFixup();
|
| AssemblerBuffer::EnsureCapacity ensured(&Buffer);
|
| const uint32_t Encoding = (encodeCondition(Cond) << kConditionShift) |
|
| (Type << kTypeShift) | (Opcode << kOpcodeShift) |
|
| @@ -276,8 +274,8 @@ void ARM32::AssemblerARM32::emitType01(CondARM32::Cond Cond, uint32_t Type,
|
| void ARM32::AssemblerARM32::emitMemOp(CondARM32::Cond Cond, uint32_t InstType,
|
| bool IsLoad, bool IsByte, uint32_t Rt,
|
| uint32_t Address) {
|
| - assert(isGPRRegisterDefined(Rt));
|
| - assert(Cond != CondARM32::kNone);
|
| + if (!isGPRRegisterDefined(Rt) || !isConditionDefined(Cond))
|
| + return setNeedsTextFixup();
|
| AssemblerBuffer::EnsureCapacity ensured(&Buffer);
|
| const uint32_t Encoding = (encodeCondition(Cond) << kConditionShift) |
|
| (InstType << kTypeShift) | (IsLoad ? L : 0) |
|
| @@ -285,6 +283,36 @@ void ARM32::AssemblerARM32::emitMemOp(CondARM32::Cond Cond, uint32_t InstType,
|
| emitInst(Encoding);
|
| }
|
|
|
| +void ARM32::AssemblerARM32::adc(const Operand *OpRd, const Operand *OpRn,
|
| + const Operand *OpSrc1, bool SetFlags,
|
| + CondARM32::Cond Cond) {
|
| + uint32_t Rd;
|
| + if (decodeOperand(OpRd, Rd) != DecodedAsRegister)
|
| + return setNeedsTextFixup();
|
| + uint32_t Rn;
|
| + if (decodeOperand(OpRn, Rn) != DecodedAsRegister)
|
| + return setNeedsTextFixup();
|
| + constexpr uint32_t Adc = B2 | B0; // 0101
|
| + uint32_t Src1Value;
|
| + // TODO(kschimpf) Other possible decodings of adc.
|
| + switch (decodeOperand(OpSrc1, Src1Value)) {
|
| + default:
|
| + return setNeedsTextFixup();
|
| + case DecodedAsRotatedImm8: {
|
| + // ADC (Immediated) = ARM section A8.8.1, encoding A1:
|
| + // adc{s}<c> <Rd>, <Rn>, #<RotatedImm8>
|
| + //
|
| + // cccc0010101snnnnddddiiiiiiiiiiii where cccc=Cond, dddd=Rd, nnnn=Rn,
|
| + // s=SetFlags and iiiiiiiiiiii=Src1Value=RotatedImm8.
|
| + if ((Rd == RegARM32::Encoded_Reg_pc && SetFlags))
|
| + // Conditions of rule violated.
|
| + return setNeedsTextFixup();
|
| + emitType01(Cond, kInstTypeDataImmediate, Adc, SetFlags, Rn, Rd, Src1Value);
|
| + return;
|
| + }
|
| + };
|
| +}
|
| +
|
| void ARM32::AssemblerARM32::add(const Operand *OpRd, const Operand *OpRn,
|
| const Operand *OpSrc1, bool SetFlags,
|
| CondARM32::Cond Cond) {
|
|
|