From patchwork Thu Dec 21 14:29:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 851997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z2Zgn21Mzz9s74 for ; Fri, 22 Dec 2017 02:05:09 +1100 (AEDT) Received: from localhost ([::1]:53793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS2PD-0004Lw-EG for incoming@patchwork.ozlabs.org; Thu, 21 Dec 2017 10:05:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS1rA-0008Qi-9i for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS1r6-00065P-Ow for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:56 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:50701) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eS1r6-00064q-Fa for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:52 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LtzWQ-1fAP0j1AFa-011V7x; Thu, 21 Dec 2017 15:29:43 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 21 Dec 2017 15:29:39 +0100 Message-Id: <20171221142939.1339-1-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 X-Provags-ID: V03:K0:W1QP7Wl+TuG+kJX5rx9j9cM0crIg9PKWvJviQGeKBT8cjkLR7iA CREPQlVP8/+UElrOC4Tc/K++/fRD+DJW3jc+41EvUxjRl848yQmX26KsfB0s3Pz5qduJOSu AVYX7XWeZOohomVDFXpslBzOE3wVe7TsF9PYKsH1gk+yLNRX1dRzL4WsLDcxHxlgi869eKb hnpVlRhCBhpIZfrQJ24CA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ZYihXCN0/i8=:l4ImnyrzzYjtjkULlTNQk6 W2NZmwr9OsjQCYl9mdB7U8Jn+TI8+HLNkYWymMR4rPYXfUvDVq/yCNw84tTHzVVKZwUWzgJ01 zMNhvNvit/duhIKdTBQrsZ1v+AIF8dycQIgGar9YdgyWWD3ZbVQf6iVGy4/W9mIKgSMDUg1w5 9jkXgbFtFnjoYOPHtY1oiSrVRFzqsZSALHMreVs1IVzzyBYg0YaNIgKeLhqlWjAbhhQhpWHv8 VUqXnWiNUfFBif1K6SHVrZzo6wtNJSx5ieW49hqeN4ms7jhQ1b9tk65hxmtJnu/9hsNlK9Z69 RXu1rPS63aEpwuV/oNrEb3LfqFmWiGDD5hHQloERjJWItEN8YNGrCKFqF8sgYu0CGJvP8qo9q EX1WT5Ej+RSw8Aeomk3kbqOA4egeJKYjawlAJxMP32lIKReo1ClUixxWi72DAZ3SNh8Oui+gb z1itowwH+VTLbKZ4t7/mkrDOTZ18ZPGYT/Q0p397/lktAwM4w7iRb85KbAx09Hexy4meW+/wU DRekgovHejr8FPsUJ7SZ9eZRE46Z1/wPWEVqkg35FOm1m8r7iwf/2D+cuLKlCtKg8aDfGeQg8 y/KZ9YOlx2YkfajFAXVRS3clo3g163I6jFCZVy46LJM0FqcfzjMl//rXU42ShJ9jeHkKvd2El LyamvBjEtoFXtSpxUfbFrtamhiTRkzfTIPIfWU/sqLkF8EteOkyFlg9KTZIGRgJcnxpW/Sk1t hUc7t03oxW2Lg78BMI8onUsx96uDkk0yugtGSg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH] target/m68k: fix set_cc_op() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Paolo Bonzini , Thomas Huth , Laurent Vivier , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The first call of set_cc_op() in a new translation sequence is done with old_op set to CC_OP_DYNAMIC (-1). This will do an out of bound access to the array cc_op_live[]. We fix that by adding an entry in cc_op_live[] for CC_OP_DYNAMIC, and in this case we can also discard QREG_CC_OP. Reported-by: Thomas Huth Signed-off-by: Laurent Vivier --- target/m68k/cpu.h | 2 +- target/m68k/translate.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index afae5f68ac..5d03764eab 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -182,7 +182,7 @@ void cpu_m68k_set_fpcr(CPUM68KState *env, uint32_t val); */ typedef enum { /* Translator only -- use env->cc_op. */ - CC_OP_DYNAMIC = -1, + CC_OP_DYNAMIC, /* Each flag bit computed into cc_[xcnvz]. */ CC_OP_FLAGS, diff --git a/target/m68k/translate.c b/target/m68k/translate.c index b60909222c..61ac1a8e83 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -207,6 +207,7 @@ typedef void (*disas_proc)(CPUM68KState *env, DisasContext *s, uint16_t insn); #endif static const uint8_t cc_op_live[CC_OP_NB] = { + [CC_OP_DYNAMIC] = CCF_C | CCF_V | CCF_Z | CCF_N | CCF_X, [CC_OP_FLAGS] = CCF_C | CCF_V | CCF_Z | CCF_N | CCF_X, [CC_OP_ADDB ... CC_OP_ADDL] = CCF_X | CCF_N | CCF_V, [CC_OP_SUBB ... CC_OP_SUBL] = CCF_X | CCF_N | CCF_V, @@ -237,6 +238,11 @@ static void set_cc_op(DisasContext *s, CCOp op) if (dead & CCF_V) { tcg_gen_discard_i32(QREG_CC_V); } + + /* Discard any computed CC_OP value */ + if (old_op == CC_OP_DYNAMIC) { + tcg_gen_discard_i32(QREG_CC_OP); + } } /* Update the CPU env CC_OP state. */