From patchwork Thu Dec 21 19:36: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: 852099 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 3z2hph55D9z9s84 for ; Fri, 22 Dec 2017 06:41:32 +1100 (AEDT) Received: from localhost ([::1]:37883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS6ig-0001Fy-Vd for incoming@patchwork.ozlabs.org; Thu, 21 Dec 2017 14:41:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS6eB-0006Ar-Hk for qemu-devel@nongnu.org; Thu, 21 Dec 2017 14:36:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS6e7-0005cJ-By for qemu-devel@nongnu.org; Thu, 21 Dec 2017 14:36:51 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:57800) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eS6e7-0005ay-2T for qemu-devel@nongnu.org; Thu, 21 Dec 2017 14:36:47 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LcJLm-1es7o32zNm-00jpp7; Thu, 21 Dec 2017 20:36:45 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 21 Dec 2017 20:36:39 +0100 Message-Id: <20171221193640.27418-5-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171221193640.27418-1-laurent@vivier.eu> References: <20171221193640.27418-1-laurent@vivier.eu> X-Provags-ID: V03:K0:nWh89Ll2Tg8YGaPwrqolESm6DjMwV1RRJxOgZb3BBwogRiOiUzy uFVu7ORShAqXJt2riTU/C3pogyxSmhOg7K+5rU63IQskaqcwom9+Km88BZq/e0OJqmdTKRs /wYD/DfO4lwOPRoczR7AbjhQ5ndkUPONkWbMzEIG1LscZICKgDhCS7lMrxSY/KXisC6W1c5 ThZEaN1GM1UAt7kn9nYYw== X-UI-Out-Filterresults: notjunk:1; V01:K0:PuC6kFmyxMs=:2Q8glbczweyPQ22aF0ZbWE nvY/KAcuk9mO3pkvv2IIIGnQ443HtS8XKxfaINgVWHBz7ZUWsoXwKawpRPDHFT5zAv/O+UmCc XN2Iojjh+l84yDTQB4RGPgX5aTJo104T4i9zF35I+2CkpJHmFQezkGLgxCsVx9IorR8sm2PmB VjvoiEDSCEV/INizUOWy5PRmT0dNm+LfsnbvSDhCfzXG+s9jDvW6o8KR2MrdqravQTCxXyoFn q+hQ4jJzQaU0z9YqXJUINiltDo4qKLYCSG02LeCQYhwJSfbWkkVyq7awqUSiE9PefE3xBERcl LhEy3LgYB5C1yMRSBjn+x/TZdFXVZuUSfbGytRG06BB+mB+loSsHhgDNupSlYTCNihondm5BZ Db/CW1PZwLCcwEYJsu+sCoN4MgctUFJx4/8z7rMGHh4ee//Eeemm86qiILhS0GXlfGC/W9uSs Sf1ns9IKl0OHKphk3vKkErwVHAaClRV2deIpHtGc2SdzAvXF9UaH9xzGK00QSjpD2L2u664R1 YZqggueL4b8WIEcds+OWcellFJtUqHHw3i2gnqC5VIeb5L+cJ1WK/lbi9oev/6drL71NoymyP e+9J7SYm2/aKFot/mz1+Ehaf3hL3HhxYFiYdVou5+XLnzAN4O+tx5gHHgohQCaRQ3lQ190SOA M0/M05r6FYVGkMAWMb+SVBaqsDyfFm24cnfV4oJoy9VlgcpPj//feWpSyeipZYdEKQ38bN7au xV4tRhvwpSjbf5MkfaSMd/NXRGcjWSC1N7YWMQH+fiIJlUXGAuZ0Btm92fM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PULL 4/5] 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: Laurent Vivier 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. Reported-by: Thomas Huth Signed-off-by: Laurent Vivier Reviewed-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20171221160558.14151-1-laurent@vivier.eu> --- target/m68k/cpu.h | 2 +- target/m68k/translate.c | 1 + 2 files changed, 2 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 dfb2d5dad2..bbda7399ec 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -202,6 +202,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,