Fix uses in ARM table media_instructions.

src/trusted/validator_arm/baseline_classes.cc

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "native_client/src/trusted/validator_arm/baseline_classes.h"
 
 #include <assert.h>
 #include <string.h>
@@ skipping 182 matching lines @@
   return (d.reg(i).Equals(Register::Pc()) ||
           (msb.value(i) < lsb.value(i)))
       ? UNPREDICTABLE
       : MAY_BE_SAFE;
 }
 
 RegisterList Binary2RegisterBitRangeMsbGeLsb::defs(Instruction i) const {
   return RegisterList(d.reg(i));
 }
 
+RegisterList Binary2RegisterBitRangeMsbGeLsb::uses(Instruction i) const {
+  return RegisterList(n.reg(i));

[JF, 2012/12/14 22:39:33]

And d.

[Karl, 2012/12/17 17:35:57]

Done.

+}
+
 // Binary2RegisterBitRangeNotRnIsPcBitfieldExtract
 SafetyLevel Binary2RegisterBitRangeNotRnIsPcBitfieldExtract
 ::safety(Instruction i) const {
   return (RegisterList(d.reg(i)).Add(n.reg(i)).Contains(Register::Pc()) ||
           (lsb.value(i) + widthm1.value(i) > 31))
       ? UNPREDICTABLE
       : MAY_BE_SAFE;
 }
 
 RegisterList Binary2RegisterBitRangeNotRnIsPcBitfieldExtract
 ::defs(Instruction i) const {
   return RegisterList(d.reg(i));
 }

[JF, 2012/12/14 22:39:33]

Add uses.

[Karl, 2012/12/17 17:35:57]

Done.

 
 // Binary2RegisterImmediateOp
 SafetyLevel Binary2RegisterImmediateOp::safety(Instruction i) const {
   if (d.reg(i).Equals(Register::Pc())) {
     if (conditions.is_updated(i)) return DECODER_ERROR;
     // NaCl Constraint.
     return FORBIDDEN_OPERANDS;
   }
   return MAY_BE_SAFE;
 }
@@ skipping 114 matching lines @@
 }
 
 // Binary3RegisterOpAltA
 SafetyLevel Binary3RegisterOpAltA::safety(Instruction i) const {
   // Unsafe if any register contains PC (ARM restriction).
   if (RegisterList(d.reg(i)).Add(m.reg(i)).Add(n.reg(i)).
       Contains(Register::Pc())) {
     return UNPREDICTABLE;
   }
 
+  // TODO(karl): This doesn't apply to all uses in rows in armv7.table.
+  // However, it doesn't really matter since we only accept version 7.
   if ((ArchVersion() < 6) && m.reg(i).Equals(n.reg(i))) return UNPREDICTABLE;
 
   // Note: We would restrict out PC as well for Rd in NaCl, but no need
   // since the ARM restriction doesn't allow it anyway.
   return MAY_BE_SAFE;
 }
 
 RegisterList Binary3RegisterOpAltA::defs(Instruction i) const {
   return RegisterList(d.reg(i)).Add(conditions.conds_if_updated(i));
 }
@@ skipping 1778 matching lines @@
 }
 
 // InstructionBarrier
 SafetyLevel InstructionBarrier::safety(Instruction i) const {
   if (option.value(i) != 0xF)
     return FORBIDDEN_OPERANDS;
   return UncondDecoder::safety(i);
 }
 
 }  // namespace nacl_arm_dec