From efc8d2f772b3de041d4f6a306e98a81d894ea53a Mon Sep 17 00:00:00 2001 From: MerryMage Date: Thu, 18 Aug 2016 18:21:48 +0100 Subject: [PATCH] arm_translator: NV conditional is obsolete --- src/frontend/translate/translate_arm.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/frontend/translate/translate_arm.cpp b/src/frontend/translate/translate_arm.cpp index fdb3a2ee..0746cea0 100644 --- a/src/frontend/translate/translate_arm.cpp +++ b/src/frontend/translate/translate_arm.cpp @@ -57,17 +57,13 @@ bool ArmTranslatorVisitor::ConditionPassed(Cond cond) { "(i.e.: one and only one conditional instruction per block)"); ASSERT_MSG(cond_state != ConditionalState::Break, "This should never happen. We requested a break but that wasn't honored."); + ASSERT_MSG(cond != Cond::NV, "NV conditional is obsolete"); if (cond == Cond::AL) { // Everything is fine with the world return true; } - if (cond == Cond::NV) { - // NV conditional is obsolete, but still seems to be used in some places! - return false; - } - // non-AL cond if (!ir.block.instructions.IsEmpty()) {