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

Unified Diff: src/IceInstARM32.cpp

Issue 1417173003: Fix ARM integrated assembler to be able to compile spec2k examples. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 5 years, 2 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
« src/IceFixups.h ('K') | « src/IceFixups.cpp ('k') | no next file » | 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 b0bc7a53ddf1d0f499dfee3964e6be091b2a1e77..d2cd6efbc4464922b84384e59acc82274ba63336 100644
--- a/src/IceInstARM32.cpp
+++ b/src/IceInstARM32.cpp
@@ -689,7 +689,6 @@ void InstARM32Mov::emit(const Cfg *Func) const {
}
void InstARM32Mov::emitIAS(const Cfg *Func) const {
- assert(getSrcSize() == 1);
(void)Func;
assert(!(isMultiDest() && isMultiSource()) && "Invalid vmov type.");
ARM32::AssemblerARM32 *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
@@ -752,8 +751,8 @@ void InstARM32Br::emitIAS(const Cfg *Func) const {
} else {
Asm->b(Asm->getOrCreateCfgNodeLabel(getTargetTrue()->getIndex()),
getPredicate());
- Asm->b(Asm->getOrCreateCfgNodeLabel(getTargetFalse()->getIndex()),
- CondARM32::AL);
+ if (const CfgNode *False = getTargetFalse())
+ Asm->b(Asm->getOrCreateCfgNodeLabel(False->getIndex()), CondARM32::AL);
}
if (Asm->needsTextFixup())
emitUsingTextFixup(Func);
« src/IceFixups.h ('K') | « src/IceFixups.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698