From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1622059261; cv=none; d=zohomail.com; s=zohoarc; b=husA0FDHy3bz6p8ix8j7uCvlhf4948V1UCOYlYLHZOrE3LDaOB3O7CAF5yKrhccZO4PdUW3g26Xd8mO7D/0hR8tew/52LbITeE87BsEZZK+y/3EdvgM7VtcyB5yqsEu3XrcvsMPVvJ2Xx2U0VQiWTFPfUi9NXJJHCVuHPSOgrd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622059261; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QJPFgLAUJqw15PdZ0SHm1pThgrCA8Pk/9ll41BITJbE=; b=GFSOsS6beeLaUQlKVvCZPO3fsHdZ5lYwjCnnrd1sCw02hgRQaA0cWeSWQLYHiaUFswByE1U7PGXygTJXgOiPFOM5AtrWHtccyBGRTIsrCaMRoD5lP2+L+KjTrL8Y7uLFKgtq2OjguRSiqIqp5m5O3NlY1aPMTQsbcYI38L8CcpU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622059261079384.48407950545686; Wed, 26 May 2021 13:01:01 -0700 (PDT) Received: from localhost ([::1]:50134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llzi7-0006yY-5R for importer@patchew.org; Wed, 26 May 2021 16:00:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llzf4-0004GI-Gs for qemu-devel@nongnu.org; Wed, 26 May 2021 15:57:50 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:37773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llzf2-0006YH-KD for qemu-devel@nongnu.org; Wed, 26 May 2021 15:57:50 -0400 Received: from quad ([82.142.6.50]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwfrG-1lVzGq0o4Q-00y6KW; Wed, 26 May 2021 21:57:46 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/4] target/m68k: introduce is_singlestepping() function Date: Wed, 26 May 2021 21:57:41 +0200 Message-Id: <20210526195744.227346-2-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210526195744.227346-1-laurent@vivier.eu> References: <20210526195744.227346-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:M899fsS/0WPY6+ZeyunWSnsP6eWaddkT9pIE3Pj+FOLlZkXUmXo gu7ZICczXGeqi6ATqZIrO6W3MpCWEgEyYU/VRLQIWEGUnFMV4f9mygPn2Khu+RE3+3il0VX nhw/rqUrc/oIcDnVmb/LbuAV/Vh17h9yzQ75TMWsbfgZT9U762+jIwaEGqhewW55xqNXUpY LKaUNOhYqHih2d68iSNAQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:OFCNXIeH8Q8=:ug5bacnmyX++xUBvcKq8gx QEdYpT6Ue0EmvL0gpAN9AgsnezYr4CAeqObod7sKE7D/Xl/E9Z5NQtNBM5as+f5/AiGUA+W1d DIo1aEUeAudEhhFDoXkWqwdykjZfv8nJse2ObP1jhd0OrNs5NxatxFCMExKKkpg3RvzXzd5lH +Ke7ewQEX9Ul2TV6yXLJN4AOrcxbOCuJU0MlECaxvzt1VN/8DtCxMjds2uD/H0p+8rYzN5vPH SpxcX/LK4y6xPntwUgqlWYjZvy0rF8f5ysli/gK8I5YAv6b60e5ZVQ0WRynSrHoBr60A7Ad9G rZ2rkGaJldpNDBUgWWj5p9b5ghDtma4jWiVg/jkdnZBCdYExbcd8j+UuRjykkAvLnhF6HxfOO djODUcNfE8vURIShkx34Xgxl8bfuHnbqUbzYgisher5LyUkCd4YwmQdJnbrBeyNjeg9nzpwqn VXpPUDJYozMUO9JYZLwWiN8Xx4VfI3pFh0qBMpy6CHdWgN0/0F9mSMjKPcSy8Vpzfp76FbVXR RlVGZSP2B9ucRgIvtVS6M8= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Mark Cave-Ayland , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland The m68k translator currently checks the DisasContextBase singlestep_enabled boolean directly to determine whether to single-step execution. Soon single-stepping may also be triggered by setting the appropriate bits in the SR register so centralise the check into a single is_singlestepping() function. Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson Message-Id: <20210519142917.16693-2-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier --- target/m68k/translate.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 200018ae6a63..c774f2e8f0fc 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -194,6 +194,17 @@ static void do_writebacks(DisasContext *s) } } =20 +static bool is_singlestepping(DisasContext *s) +{ + /* + * Return true if we are singlestepping either because of QEMU gdbstub + * singlestep. This does not include the command line '-singlestep' mo= de + * which is rather misnamed as it only means "one instruction per TB" = and + * doesn't affect the code we generate. + */ + return s->base.singlestep_enabled; +} + /* is_jmp field values */ #define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically= */ #define DISAS_EXIT DISAS_TARGET_1 /* cpu state was modified dynamical= ly */ @@ -1506,7 +1517,7 @@ static inline bool use_goto_tb(DisasContext *s, uint3= 2_t dest) /* Generate a jump to an immediate address. */ static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest) { - if (unlikely(s->base.singlestep_enabled)) { + if (unlikely(is_singlestepping(s))) { gen_exception(s, dest, EXCP_DEBUG); } else if (use_goto_tb(s, dest)) { tcg_gen_goto_tb(n); @@ -6245,7 +6256,7 @@ static void m68k_tr_tb_stop(DisasContextBase *dcbase,= CPUState *cpu) break; case DISAS_TOO_MANY: update_cc_op(dc); - if (dc->base.singlestep_enabled) { + if (is_singlestepping(dc)) { tcg_gen_movi_i32(QREG_PC, dc->pc); gen_raise_exception(EXCP_DEBUG); } else { @@ -6254,7 +6265,7 @@ static void m68k_tr_tb_stop(DisasContextBase *dcbase,= CPUState *cpu) break; case DISAS_JUMP: /* We updated CC_OP and PC in gen_jmp/gen_jmp_im. */ - if (dc->base.singlestep_enabled) { + if (is_singlestepping(dc)) { gen_raise_exception(EXCP_DEBUG); } else { tcg_gen_lookup_and_goto_ptr(); @@ -6265,7 +6276,7 @@ static void m68k_tr_tb_stop(DisasContextBase *dcbase,= CPUState *cpu) * We updated CC_OP and PC in gen_exit_tb, but also modified * other state that may require returning to the main loop. */ - if (dc->base.singlestep_enabled) { + if (is_singlestepping(dc)) { gen_raise_exception(EXCP_DEBUG); } else { tcg_gen_exit_tb(NULL, 0); --=20 2.31.1 From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1622059261; cv=none; d=zohomail.com; s=zohoarc; b=npUqXNSnRuNqNmZ0wISYV1RbLw9vo6dzr4OGVpDe2mUeRr5InHiP2SJaAI+++eVcUNS40pgSmioFz0gWplYIi4BpT8G+iUgXdIihNzR/UFMhEVvAFZAaAjkL1YFl3n4TMkiBuKBG6k+ZJEatMR5hF5MUbOUk3nlkok5sH8UMJkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622059261; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yJOfUM/8mgDa8HdDsVl+C/Y23yiFxtHhYOEA5Fk2J74=; b=EpP2i6bDXGqf9/WSs/iWwKfWzcoEbKidzESjUuxBsu0grFLMTLkOOE7J+bJrknuonOM0YqdLOJ72O7PirjKk336ON/YRoktH62gLR44wOmzHb354xwbIhwlwALjsmLLYJSPSHyPDLYU9I9pKDhjl117YhSbq2yoqZoc1EuNjTEc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622059261032615.6347884264636; Wed, 26 May 2021 13:01:01 -0700 (PDT) Received: from localhost ([::1]:50164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llzi7-0006zP-9v for importer@patchew.org; Wed, 26 May 2021 16:00:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llzf5-0004Hf-4z for qemu-devel@nongnu.org; Wed, 26 May 2021 15:57:51 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:43619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llzf2-0006YO-Nr for qemu-devel@nongnu.org; Wed, 26 May 2021 15:57:50 -0400 Received: from quad ([82.142.6.50]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MirX2-1lFypC2gvk-00ew7a; Wed, 26 May 2021 21:57:46 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/4] target/m68k: call gen_raise_exception() directly if single-stepping in gen_jmp_tb() Date: Wed, 26 May 2021 21:57:42 +0200 Message-Id: <20210526195744.227346-3-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210526195744.227346-1-laurent@vivier.eu> References: <20210526195744.227346-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ce0uu3ip48g5g++iuQO9lvrI2s5usCEKvIvvKINYXiSAH8B1jEl 2j5xd7ln0qSM8L3wUPEsSlGRlrtP+65ya4hsm2b/8yBWIbUX/Qnv9OTVP0fLXJx5iPDQuba Ld3YmjIx6uWx5wcbs3LALrpZWqdYrQH+t6UZiGFcdY4e/7tbbasbBNXAR56HG2hbRpVTj2r 1dV/j5BfPo10OmXnkFO2Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:VM7QzHX22OU=:A5vRlDd5XbNFwaVQkyxEwr 3miXnVRHZ/wqYHc3v1w/SiI4j42IPnWPccm1/z3n54gmp99oIc52+SXnR7cmUnklbz96Jpj1a m3a9SsD1EF8fqsvymqWsGCxjxSB4uLAeXI3lbJtEZn92KeJoBzPT1yXzjEOUYlleg6/ytEvpM iwpFiCkvGMLTf8+ln4rOMH6TOzTl1EUnMV7h3CkhHN4l0hw0JrIIhTIDIvHMFGUXyGv+oQ68p 4OV12qthwhY/hJfiO/xCb8eGQXxsONXiTjwEGPpzXtPSPKcNYYyxJqfeAkLgv4M+znKG4Uwb1 3iIUr3Ti+kX7N5BEO/TUqjSyvc/qxvUklaCY+lYeOKZqPIjCqnxXzksHEDjOr67wtudqlGYTY 4E7iADGbVuO4ZL3qvHdR62347RB9smpEGkWFoZkvdJHjRUER/SjE9lh0/GhnCXAMbOdZ1mC4E hpm6o3V99DFuBJbRYd8/fLXTcPNEWEopLjtBlSauEXCgq/VV0fwzF86SOTIqA77Am+cEyaW1n Hc5lphirc87T1d+lDQXxZ0= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Mark Cave-Ayland , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland In order to consolidate the single-step exception handling into a single helper, change gen_jmp_tb() so that it calls gen_raise_exception() directly instead of gen_exception(). This ensures that all single-step exceptions are now handled directly by gen_raise_exception(). Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson Message-Id: <20210519142917.16693-3-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier --- target/m68k/translate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index c774f2e8f0fc..f14ecab5a502 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1518,7 +1518,9 @@ static inline bool use_goto_tb(DisasContext *s, uint3= 2_t dest) static void gen_jmp_tb(DisasContext *s, int n, uint32_t dest) { if (unlikely(is_singlestepping(s))) { - gen_exception(s, dest, EXCP_DEBUG); + update_cc_op(s); + tcg_gen_movi_i32(QREG_PC, dest); + gen_raise_exception(EXCP_DEBUG); } else if (use_goto_tb(s, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(QREG_PC, dest); --=20 2.31.1 From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1622059483; cv=none; d=zohomail.com; s=zohoarc; b=R8gE5cApdJoL8r3LtEAiA08USBghS1uY9EvUz05fp160iNOQNRGAcChSmLV15tM1QcMT6HDbC0vpMS6Wpw4naM38DwtGO0Lx92egKDOl31/XpHJRTbCbf9j7lCzPpyol/X5/P+c4hADdc18hCWgAPUyFg92q0CK/guig44Sm9Qo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622059483; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R2o2omNkXlsGz76n4UcKPA9C7PWJG++REpFInfeXBvE=; b=ZWIHz15X03YKbPvuhocjvSrqP8f7NgdVxsPxnJHZfpW6m7MyIAgsVqE2SmA4WfU9Kl7ZZ/+dHriAALHORF1vlEL08DUVRQnor/rfVEuEIg57m9kgiMtkgH8Vw+tVXLIghpem68lUz7yU14qjq7EGgVHbjclste9zGgO9QasRWH4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162205948300267.83680850813437; Wed, 26 May 2021 13:04:43 -0700 (PDT) Received: from localhost ([::1]:55094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llzlh-00021M-VD for importer@patchew.org; Wed, 26 May 2021 16:04:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llzf5-0004IE-DN for qemu-devel@nongnu.org; Wed, 26 May 2021 15:57:51 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:42993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llzf3-0006Z0-Dm for qemu-devel@nongnu.org; Wed, 26 May 2021 15:57:51 -0400 Received: from quad ([82.142.6.50]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N7iT4-1lPMUb0aI6-014kA4; Wed, 26 May 2021 21:57:47 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/4] target/m68k: introduce gen_singlestep_exception() function Date: Wed, 26 May 2021 21:57:43 +0200 Message-Id: <20210526195744.227346-4-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210526195744.227346-1-laurent@vivier.eu> References: <20210526195744.227346-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Y/+u/ORQpiW5R4bjfub+Yh3AbZsEEppRfPWNnqAjZSJH9NV2/p5 7X/ykCIXXTAy1Z7/+XbKNG1NVlT34DzKHgnIuMDRSki5nVc5d+bOdaul+Sj/ETmnH9VuAxV xqOGfpzkcpncOwoxUXxgNtkfged5pqPAp+wymMj6m08zUO+WcaQSwJ0uFW/eFSqu0TcXVfe KegefYTuJYzW/OcLAbqug== X-UI-Out-Filterresults: notjunk:1;V03:K0:PEZdLa43wkk=:Bm0/64PwzLlDhRESgnGGQs Ao8KmJeTLHcN8QLJjMYgFqco5z/KVwi6pkNx/asfS+w6mEIEA14P6U3bSCmte9ei7khWxV7Ng lsWdUxCtd9e+QBQtWzHtd1mnpSzFJ9GaXPq2hIyPg1L3ZfW8JrOQ2JBZS2x7l2W/aAbI95Uvr /ETv4/1O4fpAqpOK8T5i+8BRcff8hERRxlfVQShx8I6xNBE7d23BNcme1WfalTQI21OAl5TLt h7hZsy+7ouMpktTZPznX02SFV4lXkaWfW7KqiAzBl5Obyszli0fOHmW8zxYxMr1z+smd8Qmtf 4nSgHJ/ZV1RWj/s2sMW0dhEsEInJZoyRZV1hW5+/APQXatVH5PwShO6+/5sn43HLA0qjZUvnY W9lBdJA3aKMkPiPXDbJMKvB4PdNWPQvtRsL8BXT2w4o8Gh+owNEIpCMc6y8MEzwJcEdWCmZer 2GdHctDtHQPeVLYiwFxEw84TKYIxCLtVR/V9Jiti9Bl+TEYr3MAIfqjvL2T5x/zmXunxuvLZZ MKIE8MERPuK6W87+IDh39A= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Mark Cave-Ayland , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland Introduce a new gen_singlestep_exception() function to be called when gener= ating the EXCP_DEBUG exception in single-step mode rather than calling gen_raise_exception(EXCP_DEBUG) directly. This allows for the single-step exception behaviour for all callers to be managed in a single place. Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson Message-Id: <20210519142917.16693-4-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier --- target/m68k/translate.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index f14ecab5a502..10e8aba42e42 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -319,6 +319,15 @@ static void gen_exception(DisasContext *s, uint32_t de= st, int nr) s->base.is_jmp =3D DISAS_NORETURN; } =20 +static void gen_singlestep_exception(DisasContext *s) +{ + /* + * Generate the right kind of exception for singlestep, which is + * EXCP_DEBUG for QEMU's gdb singlestepping. + */ + gen_raise_exception(EXCP_DEBUG); +} + static inline void gen_addr_fault(DisasContext *s) { gen_exception(s, s->base.pc_next, EXCP_ADDRESS); @@ -1520,7 +1529,7 @@ static void gen_jmp_tb(DisasContext *s, int n, uint32= _t dest) if (unlikely(is_singlestepping(s))) { update_cc_op(s); tcg_gen_movi_i32(QREG_PC, dest); - gen_raise_exception(EXCP_DEBUG); + gen_singlestep_exception(s); } else if (use_goto_tb(s, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(QREG_PC, dest); @@ -6260,7 +6269,7 @@ static void m68k_tr_tb_stop(DisasContextBase *dcbase,= CPUState *cpu) update_cc_op(dc); if (is_singlestepping(dc)) { tcg_gen_movi_i32(QREG_PC, dc->pc); - gen_raise_exception(EXCP_DEBUG); + gen_singlestep_exception(dc); } else { gen_jmp_tb(dc, 0, dc->pc); } @@ -6268,7 +6277,7 @@ static void m68k_tr_tb_stop(DisasContextBase *dcbase,= CPUState *cpu) case DISAS_JUMP: /* We updated CC_OP and PC in gen_jmp/gen_jmp_im. */ if (is_singlestepping(dc)) { - gen_raise_exception(EXCP_DEBUG); + gen_singlestep_exception(dc); } else { tcg_gen_lookup_and_goto_ptr(); } @@ -6279,7 +6288,7 @@ static void m68k_tr_tb_stop(DisasContextBase *dcbase,= CPUState *cpu) * other state that may require returning to the main loop. */ if (is_singlestepping(dc)) { - gen_raise_exception(EXCP_DEBUG); + gen_singlestep_exception(dc); } else { tcg_gen_exit_tb(NULL, 0); } --=20 2.31.1 From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1622059630; cv=none; d=zohomail.com; s=zohoarc; b=jla6SLFfjfJD1102HDqJOHEE3t3qnoKX26cLkKINd4Li+WnAG16Q2pYb253jeT1omo2GNRCVU3JQdTyMBHKSPY71dJ0JXmTYUyeQHxxCrWOZjDCO2PIae7Kl/Jt6sXIbI41Jh7DsSp2ZbDz/o1CLBsmPEvZG7/9uBTF9CUnNh18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622059630; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XfNv9KBM3W6lb3NSDavOegL7s2eyLteyfK+V/EID9F8=; b=MckIJcUpNkQZ8dBXlZSn6zGMop6zIGmqDu1Va0BvPKnbnZ5mDNLBaj+PCWEVr+TVHbA3e0hLFwlyElvuuqzXBWmj93ZDVPjb/Cxtlyyr300zeQoth4pu36bIcrHF0Jc/RXS4s9gDy7T3L8BSy1FzIITJ+nn6m+y0ZRP8qzTu5JQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622059630946395.8297001216531; Wed, 26 May 2021 13:07:10 -0700 (PDT) Received: from localhost ([::1]:57084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llzo5-0003Rq-Mr for importer@patchew.org; Wed, 26 May 2021 16:07:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llzf5-0004JG-PV for qemu-devel@nongnu.org; Wed, 26 May 2021 15:57:51 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:53007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llzf3-0006ZN-Ou for qemu-devel@nongnu.org; Wed, 26 May 2021 15:57:51 -0400 Received: from quad ([82.142.6.50]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwQCb-1lTVVO2hfx-00sK6R; Wed, 26 May 2021 21:57:47 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/4] target/m68k: implement m68k "any instruction" trace mode Date: Wed, 26 May 2021 21:57:44 +0200 Message-Id: <20210526195744.227346-5-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210526195744.227346-1-laurent@vivier.eu> References: <20210526195744.227346-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:eq05lylNytZybwASHhCEmYHtfWRiCeurrCPzkNlWUuj48QhQ/J8 NVSpcB1mU0XTKaR33/KaAt+ZN7CCdDtc+9wD/GrV5Hxcq4VmxWfIzvhLXXrHCwVTpy+JryC tFoFGwbE8C75NRIdY90pE8P/X88YejXoHG4ZH22WX3nQqX1bzFO96NLuQ0bPL+/qo0+wLKg 9VJU+mO5D2X4jZvuozIgA== X-UI-Out-Filterresults: notjunk:1;V03:K0:3m4Faw4t1jY=:4CQmkEwxK0g7fyBbHsI5I1 3ydB2z9tGnyF4qCiIPXa45aWtUoARMrNec7Xh3IjEAeKw9AsNtnwkIzPeLhLPNuwSE+pZC2nl n8hhCSBKZLJgU91Ws39W+/BKiS0VC+Kk9D0yRPItvM8wiAK2uFd+mzyTpOfc75IvX/wVdBQux BnXrUNYpcWTmDrdd8wpWRajOlnqIOxFcKjXWkMSlO4Y95kcm2OxOQoTh8butjUGX1SiA+giRz DCGQr7U/KRjRjIFEWmxTIu9izYDbkcNjcH86avd5s4dGpLzoRKWF+YauIuW9dHoF0OD/HPk7p TFV97n0tOWx+kIrppqFWtvAsvOWMYkQa0AF19utMNXESmFS+IhGjEBXMfReTIRmXPc73DUYsK cxw2ZJk7JW2O+3lSK8pvehlruA2xGFU2dqPVYSn7RUGokbC0GhCrXEXJnwzIriUuT9kWcRJNA 4PcyzhBH8Sw5wxrFeBFMHVngTytqITxyDryK9M4v2QCnvQZ2Cp3aC1DR3O5kBJzM0vaHzSMe4 B9kiwrJcK3hn2SNPWqjalA= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Mark Cave-Ayland , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland The m68k trace mode is controlled by the top 2 bits in the SR register. Imp= lement the m68k "any instruction" trace mode where bit T1=3D1 and bit T0=3D0 in wh= ich the CPU generates an EXCP_TRACE exception (vector 9 or offset 0x24) after executing= each instruction. This functionality is used by the NetBSD kernel debugger to allow single-st= epping on m68k architectures. Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson Message-Id: <20210519142917.16693-5-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier --- target/m68k/cpu.h | 8 ++++++++ target/m68k/translate.c | 27 ++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 402c86c8769e..997d588911c6 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -230,6 +230,9 @@ typedef enum { #define SR_T_SHIFT 14 #define SR_T 0xc000 =20 +#define M68K_SR_TRACE(sr) ((sr & SR_T) >> SR_T_SHIFT) +#define M68K_SR_TRACE_ANY_INS 0x2 + #define M68K_SSP 0 #define M68K_USP 1 #define M68K_ISP 2 @@ -590,6 +593,8 @@ typedef M68kCPU ArchCPU; #define TB_FLAGS_SFC_S (1 << TB_FLAGS_SFC_S_BIT) #define TB_FLAGS_DFC_S_BIT 15 #define TB_FLAGS_DFC_S (1 << TB_FLAGS_DFC_S_BIT) +#define TB_FLAGS_TRACE 16 +#define TB_FLAGS_TRACE_BIT (1 << TB_FLAGS_TRACE) =20 static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *p= c, target_ulong *cs_base, uint32_t *f= lags) @@ -602,6 +607,9 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *e= nv, target_ulong *pc, *flags |=3D (env->sfc << (TB_FLAGS_SFC_S_BIT - 2)) & TB_FLAGS_SFC_= S; *flags |=3D (env->dfc << (TB_FLAGS_DFC_S_BIT - 2)) & TB_FLAGS_DFC_= S; } + if (M68K_SR_TRACE(env->sr) =3D=3D M68K_SR_TRACE_ANY_INS) { + *flags |=3D TB_FLAGS_TRACE; + } } =20 void dump_mmu(CPUM68KState *env); diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 10e8aba42e42..f0c5bf9154e0 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -124,6 +124,7 @@ typedef struct DisasContext { #define MAX_TO_RELEASE 8 int release_count; TCGv release[MAX_TO_RELEASE]; + bool ss_active; } DisasContext; =20 static void init_release_array(DisasContext *s) @@ -197,12 +198,13 @@ static void do_writebacks(DisasContext *s) static bool is_singlestepping(DisasContext *s) { /* - * Return true if we are singlestepping either because of QEMU gdbstub - * singlestep. This does not include the command line '-singlestep' mo= de - * which is rather misnamed as it only means "one instruction per TB" = and - * doesn't affect the code we generate. + * Return true if we are singlestepping either because of + * architectural singlestep or QEMU gdbstub singlestep. This does + * not include the command line '-singlestep' mode which is rather + * misnamed as it only means "one instruction per TB" and doesn't + * affect the code we generate. */ - return s->base.singlestep_enabled; + return s->base.singlestep_enabled || s->ss_active; } =20 /* is_jmp field values */ @@ -323,9 +325,14 @@ static void gen_singlestep_exception(DisasContext *s) { /* * Generate the right kind of exception for singlestep, which is - * EXCP_DEBUG for QEMU's gdb singlestepping. + * either the architectural singlestep or EXCP_DEBUG for QEMU's + * gdb singlestepping. */ - gen_raise_exception(EXCP_DEBUG); + if (s->ss_active) { + gen_raise_exception(EXCP_TRACE); + } else { + gen_raise_exception(EXCP_DEBUG); + } } =20 static inline void gen_addr_fault(DisasContext *s) @@ -6194,6 +6201,12 @@ static void m68k_tr_init_disas_context(DisasContextB= ase *dcbase, CPUState *cpu) dc->done_mac =3D 0; dc->writeback_mask =3D 0; init_release_array(dc); + + dc->ss_active =3D (M68K_SR_TRACE(env->sr) =3D=3D M68K_SR_TRACE_ANY_INS= ); + /* If architectural single step active, limit to 1 */ + if (is_singlestepping(dc)) { + dc->base.max_insns =3D 1; + } } =20 static void m68k_tr_tb_start(DisasContextBase *dcbase, CPUState *cpu) --=20 2.31.1