commit 82975ba6fc68c16f10bb437d95d9c0d1859b141e
author Karl Schimpf <kschimpf@google.com> Tue Feb 02 10:17:01 2016 -0800
committer Karl Schimpf <kschimpf@google.com> Tue Feb 02 10:17:01 2016 -0800
tree 812910e30d5992ed3edc88e30e8dfda030f2f773
parent ee1aae820b08055583e6c9be7a3118d1e975a45d

Fix skip_unimplemented for filetype=obj in ARM.

Fixes generation of emit text fixup code in integrated ARM assembler to
properly reset the text fixup flag when skipping unimplemented
instructions.

Also fixes broken assertion for the "vmul" instruction.

BUG=None
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1656023002 .

src/IceAssembler.cpp

diff --git a/src/IceAssembler.cpp b/src/IceAssembler.cpp
index 44c4ee2..28851f9 100644
--- a/src/IceAssembler.cpp
+++ b/src/IceAssembler.cpp
@@ -66,7 +66,7 @@
   AssemblerTextFixup *F = new (Assemblr.allocate<AssemblerTextFixup>())
       AssemblerTextFixup(Text, BytesUsed);
   installFixup(F);
-  TextFixupNeeded = false;
+  resetNeedsTextFixup();
   return F;
 }
 

src/IceAssembler.h

diff --git a/src/IceAssembler.h b/src/IceAssembler.h
index d3111ad..5c8091d 100644
--- a/src/IceAssembler.h
+++ b/src/IceAssembler.h
@@ -184,6 +184,7 @@
   /// Mark that an attempt was made to emit, but failed. Hence, in order to
   /// continue, one must emit a text fixup.
   void setNeedsTextFixup() { TextFixupNeeded = true; }
+  void resetNeedsTextFixup() { TextFixupNeeded = false; }
 
   /// Returns true if last emit failed and needs a text fixup.
   bool needsTextFixup() const { return TextFixupNeeded; }
@@ -310,6 +311,7 @@
   }
 
   void setNeedsTextFixup() { Buffer.setNeedsTextFixup(); }
+  void resetNeedsTextFixup() { Buffer.resetNeedsTextFixup(); }
 
   bool needsTextFixup() const { return Buffer.needsTextFixup(); }
 

src/IceInstARM32.cpp

diff --git a/src/IceInstARM32.cpp b/src/IceInstARM32.cpp
index 23216a0..7189c02 100644
--- a/src/IceInstARM32.cpp
+++ b/src/IceInstARM32.cpp
@@ -98,6 +98,12 @@
     return;
   GlobalContext *Ctx = Func->getContext();
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
+  if (Ctx->getFlags().getDisableHybridAssembly() &&
+      Ctx->getFlags().getSkipUnimplemented()) {
+    Asm->trap();
+    Asm->resetNeedsTextFixup();
+    return;
+  }
   std::string Buffer;
   llvm::raw_string_ostream StrBuf(Buffer);
   OstreamLocker L(Ctx);
@@ -116,6 +122,7 @@
       llvm::errs() << "Can't assemble: " << StrBuf.str() << "\n";
       UnimplementedError(Ctx->getFlags());
     }
+    Asm->resetNeedsTextFixup();
     return;
   }
   Asm->emitTextInst(StrBuf.str(), Asm->getEmitTextSize());
@@ -751,17 +758,16 @@
   default:
     // TODO(kschimpf) Figure if more cases are needed.
     emitUsingTextFixup(Func);
-    break;
+    return;
   case IceType_f32:
     Asm->vmuls(getDest(), getSrc(0), getSrc(1), CondARM32::AL);
     assert(!Asm->needsTextFixup());
-    break;
+    return;
   case IceType_f64:
     Asm->vmuld(getDest(), getSrc(0), getSrc(1), CondARM32::AL);
     assert(!Asm->needsTextFixup());
-    break;
+    return;
   }
-  assert(!Asm->needsTextFixup());
 }
 
 InstARM32Call::InstARM32Call(Cfg *Func, Variable *Dest, Operand *CallTarget)