Merge remote branch 'qemu-kvm/uq/master' into staging

[qemu.git] / target-cris / op_helper.c

diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index edfaf41a8c74bba01874065490251cab42f51fb8..a60da94f309628df4f4bf9815c769aa1cddd30bf 100644 (file)
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -15,8 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "exec.h"
@@ -277,6 +276,8 @@ uint32_t helper_btst(uint32_t t0, uint32_t t1, uint32_t ccs)
 
        /* Clear the X, N and Z flags.  */
        ccs = ccs & ~(X_FLAG | N_FLAG | Z_FLAG);
+       if (env->pregs[PR_VR] < 32)
+               ccs &= ~(V_FLAG | C_FLAG);
        /* Set the N and Z flags accordingly.  */
        ccs |= (bset << 3) | (fz << 2);
        return ccs;