Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: src/IceInstARM32.cpp

Issue 1654483002: Fix nits in committed CL's for the integrated ARM assembler. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests_lit/assembler/arm32/trap.ll » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/IceInstARM32.cpp
diff --git a/src/IceInstARM32.cpp b/src/IceInstARM32.cpp
index c32fcaa55c795bcd29fead5eb3d0c6716b25b671..13e06c02c3f956726810230130f94ee172c22fa5 100644
--- a/src/IceInstARM32.cpp
+++ b/src/IceInstARM32.cpp
@@ -110,8 +110,12 @@ void InstARM32::emitUsingTextFixup(const Cfg *Func) const {
emit(Func);
Ctx->setStrEmit(OldStr);
if (Ctx->getFlags().getDisableHybridAssembly()) {
- llvm::errs() << "Can't assemble: " << StrBuf.str() << "\n";
- UnimplementedError(Ctx->getFlags());
+ if (Ctx->getFlags().getSkipUnimplemented()) {
+ Asm->trap();
+ } else {
+ llvm::errs() << "Can't assemble: " << StrBuf.str() << "\n";
+ UnimplementedError(Ctx->getFlags());
+ }
return;
}
Asm->emitTextInst(StrBuf.str(), Asm->getEmitTextSize());
@@ -1701,7 +1705,7 @@ template <> void InstARM32Vsqrt::emitIAS(const Cfg *Func) const {
Asm->vsqrtd(Dest, getSrc(0), getPredicate());
break;
default:
- llvm::report_fatal_error("Vqrt of non-floating type");
+ llvm::report_fatal_error("Vsqrt of non-floating type");
}
if (Asm->needsTextFixup())
emitUsingTextFixup(Func);
« no previous file with comments | « no previous file | tests_lit/assembler/arm32/trap.ll » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698