[SubZero] Fix code generation issues occurred in Cross-test and PNaCL smoke-tests

src/IceAssemblerMIPS32.cpp

 //===- subzero/src/IceAssemblerMIPS32.cpp - MIPS32 Assembler --------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 178 matching lines @@
 }
 
 void AssemblerMIPS32::bind(Label *L) {
   IOffsetT BoundPc = Buffer.size();
   assert(!L->isBound()); // Labels can only be bound once.
   while (L->isLinked()) {
     IOffsetT Position = L->getLinkPosition();
     IOffsetT Dest = BoundPc - Position;
     IValueT Inst = Buffer.load<IValueT>(Position);
     Buffer.store<IValueT>(Position, encodeBranchOffset(Dest, Inst));
-    L->setPosition(decodeBranchOffset(Inst));
+    IOffsetT NextBrPc = decodeBranchOffset(Inst);
+    if (NextBrPc != 0)
+      NextBrPc = Position - NextBrPc;
+    L->setPosition(NextBrPc);
   }
   L->bindTo(BoundPc);
 }
 
 void AssemblerMIPS32::emitRsRt(IValueT Opcode, const Operand *OpRs,
                                const Operand *OpRt, const char *InsnName) {
   const IValueT Rs = encodeGPRegister(OpRs, "Rs", InsnName);
   const IValueT Rt = encodeGPRegister(OpRt, "Rt", InsnName);
 
   Opcode |= Rs << 21;
@@ skipping 211 matching lines @@
 
 void AssemblerMIPS32::b(Label *TargetLabel) {
   static constexpr Operand *OpRsNone = nullptr;
   static constexpr Operand *OpRtNone = nullptr;
   if (TargetLabel->isBound()) {
     const int32_t Dest = TargetLabel->getPosition() - Buffer.size();
     emitBr(CondMIPS32::AL, OpRsNone, OpRtNone, Dest);
     return;
   }
   const IOffsetT Position = Buffer.size();
-  emitBr(CondMIPS32::AL, OpRsNone, OpRtNone, TargetLabel->getEncodedPosition());
+  IOffsetT PrevPosition = TargetLabel->getEncodedPosition();
+  if (PrevPosition != 0)
+    PrevPosition = Position - PrevPosition;
+  emitBr(CondMIPS32::AL, OpRsNone, OpRtNone, PrevPosition);
   TargetLabel->linkTo(*this, Position);
 }
 
 void AssemblerMIPS32::c_eq_d(const Operand *OpFs, const Operand *OpFt) {
   static constexpr IValueT Opcode = 0x44000032;
   emitCOP1Fcmp(Opcode, DoublePrecision, OpFs, OpFt, OperandMIPS32FCC::FCC0,
                "c.eq.d");
 }
 
 void AssemblerMIPS32::c_eq_s(const Operand *OpFs, const Operand *OpFt) {
@@ skipping 401 matching lines @@
 
 void AssemblerMIPS32::movn(const Operand *OpRd, const Operand *OpRs,
                            const Operand *OpRt) {
   static constexpr IValueT Opcode = 0x0000000B;
   emitRdRsRt(Opcode, OpRd, OpRs, OpRt, "movn");
 }
 
 void AssemblerMIPS32::movn_d(const Operand *OpFd, const Operand *OpFs,
                              const Operand *OpFt) {
   static constexpr IValueT Opcode = 0x44000013;
-  emitCOP1FmtRtFsFd(Opcode, SinglePrecision, OpFd, OpFs, OpFt, "movn.d");
+  emitCOP1FmtRtFsFd(Opcode, DoublePrecision, OpFd, OpFs, OpFt, "movn.d");
 }
 
 void AssemblerMIPS32::movn_s(const Operand *OpFd, const Operand *OpFs,
                              const Operand *OpFt) {
   static constexpr IValueT Opcode = 0x44000013;
   emitCOP1FmtRtFsFd(Opcode, SinglePrecision, OpFd, OpFs, OpFt, "movn.s");
 }
 
 void AssemblerMIPS32::movt(const Operand *OpRd, const Operand *OpRs,
                            const Operand *OpCc) {
   IValueT Opcode = 0x00000001;
   const IValueT Rd = encodeGPRegister(OpRd, "Rd", "movt");
   const IValueT Rs = encodeGPRegister(OpRs, "Rs", "movt");
   OperandMIPS32FCC::FCC Cc = OperandMIPS32FCC::FCC0;
   if (const auto *OpFCC = llvm::dyn_cast<OperandMIPS32FCC>(OpCc)) {
     Cc = OpFCC->getFCC();
   }
   const IValueT InstEncodingTrue = 1;
   Opcode |= Rd << 11;
   Opcode |= InstEncodingTrue << 16;
   Opcode |= Cc << 18;
   Opcode |= Rs << 21;
   emitInst(Opcode);
 }
 
 void AssemblerMIPS32::movz_d(const Operand *OpFd, const Operand *OpFs,
                              const Operand *OpFt) {
   static constexpr IValueT Opcode = 0x44000012;
-  emitCOP1FmtFtFsFd(Opcode, SinglePrecision, OpFd, OpFs, OpFt, "movz.d");
+  emitCOP1FmtFtFsFd(Opcode, DoublePrecision, OpFd, OpFs, OpFt, "movz.d");
 }
 
 void AssemblerMIPS32::movz(const Operand *OpRd, const Operand *OpRs,
                            const Operand *OpRt) {
   static constexpr IValueT Opcode = 0x0000000A;
   emitRdRsRt(Opcode, OpRd, OpRs, OpRt, "movz");
 }
 
 void AssemblerMIPS32::movz_s(const Operand *OpFd, const Operand *OpFs,
                              const Operand *OpFt) {
@@ skipping 339 matching lines @@
 }
 
 void AssemblerMIPS32::bcc(const CondMIPS32::Cond Cond, const Operand *OpRs,
                           const Operand *OpRt, Label *TargetLabel) {
   if (TargetLabel->isBound()) {
     const int32_t Dest = TargetLabel->getPosition() - Buffer.size();
     emitBr(Cond, OpRs, OpRt, Dest);
     return;
   }
   const IOffsetT Position = Buffer.size();
-  emitBr(Cond, OpRs, OpRt, TargetLabel->getEncodedPosition());
+  IOffsetT PrevPosition = TargetLabel->getEncodedPosition();
+  if (PrevPosition != 0)
+    PrevPosition = Position - PrevPosition;
+  emitBr(Cond, OpRs, OpRt, PrevPosition);
   TargetLabel->linkTo(*this, Position);
 }
 
 void AssemblerMIPS32::bzc(const CondMIPS32::Cond Cond, const Operand *OpRs,
                           Label *TargetLabel) {
   static constexpr Operand *OpRtNone = nullptr;
   if (TargetLabel->isBound()) {
     const int32_t Dest = TargetLabel->getPosition() - Buffer.size();
     emitBr(Cond, OpRs, OpRtNone, Dest);
     return;
   }
   const IOffsetT Position = Buffer.size();
-  emitBr(Cond, OpRs, OpRtNone, TargetLabel->getEncodedPosition());
+  IOffsetT PrevPosition = TargetLabel->getEncodedPosition();
+  if (PrevPosition)
+    PrevPosition = Position - PrevPosition;
+  emitBr(Cond, OpRs, OpRtNone, PrevPosition);
   TargetLabel->linkTo(*this, Position);
 }
 
 } // end of namespace MIPS32
 } // end of namespace Ice