From patchwork Thu Dec 21 16:05:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 852029 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 3z2c2p3FVVz9s81 for ; Fri, 22 Dec 2017 03:06:42 +1100 (AEDT) Received: from localhost ([::1]:56888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS3Mm-0004pi-KJ for incoming@patchwork.ozlabs.org; Thu, 21 Dec 2017 11:06:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS3MS-0004pH-TC for qemu-devel@nongnu.org; Thu, 21 Dec 2017 11:06:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS3MO-0005HZ-0D for qemu-devel@nongnu.org; Thu, 21 Dec 2017 11:06:20 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:64243) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eS3MN-0005G9-NT for qemu-devel@nongnu.org; Thu, 21 Dec 2017 11:06:15 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MCqZf-1eISZF2cuB-009faz; Thu, 21 Dec 2017 17:06:02 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 21 Dec 2017 17:05:58 +0100 Message-Id: <20171221160558.14151-1-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 X-Provags-ID: V03:K0:oCk6v5AfMu9hawVrlkFIn+q3W9T0anuOaQ0jesJ+Lqn5L/tNXiD +Et+cJ69UGDTczICTDyskQ3y043sFEvJ1F5bxmXHjILDA1xLWRfA351xdZ7GvPJRgUXTEcU 7q9tLOsA+oWHIIMGinfCS+DD6kNBvqqCEt1nSunuHO3VcN1ycZHkeZXj+7sEINy6N/zoCP7 qno2McchqgfJmOMXTqLWQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:xhrW7TkEsfU=:yEVPFxHP8C63Qiq8pCgwEN GGdhuRRAbFsy7vVsdbkbRuJdz5Zgr3iI5JiMgfYXBj3GTBh5JEvY2TbLK7Fd0uIkyPMaE9CE2 REBodOsFu44jRbenCplbQJF1ZpEl8+CXNJDJXg+IvDp32BQaBsail1+sgfxpRM65z2nJWi00H LvbqHlrbqBjRtN6Si/HFu4JN7EzEdKzGGBMWPGNQCHTSsBo2glDiZB87t7JK3Uc67a2cV0jnO u+2dh5cy79Wbp7RLeT29dH7CHzAMtCZ2ARNYIXw+E25rf1oPA82ZXSJAjTAEH/7Ob3RgV7/4I 3rqYJx2quu37Nlb9Aat8hpsvj9svmjSTf6/EqGweAsfVZrBYpwYRapE6JDbX8SaCydjJFh30x ZN/KiXhfnTDfXfrqvqqXzEebc5BsVHD5QbHvw5XwqEp3S3nm55GUglITEcjZW4LCtCSlSUa0j OzjUW8DcaWWCW87p1+JOEJGEkd0S+JJqrgXhnMvkqu8mWGwwMPib1r8usSl1RO+tLl/0QqCRu MmukAKn0YB3NXdCRs6j60scDgJCkNrwjZWiMA7fDuxOsq4Fcap5m8yaV7jJzg5cYLg797WNei pIt1uhQQptJsquxr8f0XmRZ2d3OYjTfYmHoB0bh9TjO3z7A3pIcxGOfnYti3nRwZp6TRmx+CA qvbQY8FsbDdsiF+PLZS2gAisv27URZNahUEDbL0oYgrPIiz3Rgw6ZK0rQvrPRwxxripAnsBTl kX2EdxXGqrMubbYGcwfSlC3aU9RNnVM1qu1f7hYHOJXE6RzL2hdrfVspRn/DVwojYYoEPstm3 5l6L5lH047FqLJPTdeJWrw+Dr7rnzQyoWn9m/5N3YmoGAUTvH+K9KIQ7TVkymHVPGXCLNUTu0 Qigbd17MIf7BRPd++Ps1ae3Y60NJY3HV13lJrcQAZeVbAn+tv0lLdT6JTn7HDR X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PATCH v2] 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: Paolo Bonzini , Thomas Huth , Richard Henderson , Laurent Vivier , Peter Maydell 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 --- v2: no need to discard QREG_CC_OP (rth) 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 b60909222c..087a5b5f93 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,