From patchwork Sat Jul 17 22:18:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 479265 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2748945jao; Sat, 17 Jul 2021 15:29:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrbFrTj1J3qfPJBtJ0uoWjZceyjNM7MrZA8Ez/QMaDXFlt0TArmxRwJDLCocYozgIF3Po8 X-Received: by 2002:a0c:eece:: with SMTP id h14mr17724157qvs.12.1626560968145; Sat, 17 Jul 2021 15:29:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626560968; cv=none; d=google.com; s=arc-20160816; b=kNEsX8VcefcBhEB+Sva4oufX4Ftkg2noCZwR6DKlszldaZMQNAcv4dvxdqv9D84vzz ysfX8yB+hZYrYygp8xQ7C7HwM0NonuZd1laGQHCeYT/JyZAmgYSWVkbP0P6VyCOSqL0E ZSB3q8YpWG9PdKRfWWyMhO4IcL0FMBThPvTYWGm3GhV3wcmijPdxsmGwEwyXv95YB/yN ule/t/JP4Lnj+ADCoqBFgIM90j/nHNQv/nQbO2WeMigcdf8qoqV53Kno2osgjlMy7FDp 66asPfTN45vJE9uQu2hACYKoo8XKOpLAIgQeYGybiqlmnchFJgKIL4PLAjNKjzKVTgWl DCQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=mOMfbSr7dP2LtForXHD7QhzKF/cyMbvAW5OerGJ5K/M=; b=VEh9QWq94OTkI3TOlJqut2Yj+7DDOsqQ3Yyhc7J5VwkNFK+bSz64Be4vXiazm20hvp /7qzKUmqdoMekEQhl1d4Qfmi3vXcIWY0B+M/NSqxCdLrq8Qy2Jt5KS0JTbJ2+r6s/b9+ j/iOKW1oHDORF9qHBI5pp2suS/Ge4Rmyrk+UBW6W/vlZq6oXqVEx94P6xONbBgm8QIMO FQ+L3I2mgNHpy6VRYjwvdNC42jQDYI7C0h2FcM1n0CNe4Kp9JqvqPE+/IHdBjfuQpKNu SlIHl+OfIVTqu6imB9tTkMBn+cWALgDD5u+2IpJ4gZHpUk46a55ShPYoDoJnpRZVUCN6 3ERg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bfcl9CDi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c14si12693555qtc.205.2021.07.17.15.29.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 17 Jul 2021 15:29:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bfcl9CDi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4soJ-0003jf-KF for patch@linaro.org; Sat, 17 Jul 2021 18:29:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4seD-0006xk-RW for qemu-devel@nongnu.org; Sat, 17 Jul 2021 18:19:01 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:37591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4seB-0001zs-D6 for qemu-devel@nongnu.org; Sat, 17 Jul 2021 18:19:01 -0400 Received: by mail-pg1-x533.google.com with SMTP id t9so14558475pgn.4 for ; Sat, 17 Jul 2021 15:18:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mOMfbSr7dP2LtForXHD7QhzKF/cyMbvAW5OerGJ5K/M=; b=bfcl9CDi26J7MiZXUkagOXNTrZT/eYbYlWvktchcemB+3ANs0MvTFXJo4Gao4K/HqF /Ku8l4YfLLhUNMRo76nhWUf6ADo07jDTfQGFmUjziTxr5Bz1dHCBH+BpvybNF6HqQpiF glTY5iWrjzF+Klc6mOAepZp3hCd56nyeEJ6Y3HZp7RH35L4CTZY+T5fDZSEHLtMt95hy EmrP1lfKZ/pouLZl1iEyjEE3rjlat76A9fjEEQGNeHyzonRcIkaDtey0cypYnYn59Mtc pAnnq+j8exjUgrQzeG3U9/f0mlQnh681aemWRiy4yD0TZizUQVbuy4QbcBzIVhPqr3xg Y3tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mOMfbSr7dP2LtForXHD7QhzKF/cyMbvAW5OerGJ5K/M=; b=gWxbQvhNl5/+LcQ0eJ5oZyJQ+CnpIlsf8agy48Lk9rWVz5Fv4JZ/DkuBUV7fC045Yu 5Smd1RDHBINffeNV0HiQkwt3E4qD9ulOOfG3+D4j7Ujdt8qYY800V5OoFj0pR8/nzpvx O5E2DfnsPb4pl2qI6NUXG/gNvG826rFY/Xs2/hdk3+B4OiJgtWhtLVwxBsxiLYtuR4N1 nQnjqI3VC/Xg5loLvB7i3zmZKd0Yg1UV84PQPXWCzxbGDnfxJdPCzb+2PNyqP1duayla IR4LxMvnRiojSFBQuiT7VZRZaXNH4xD7VE7GcUvXQBzv9CYv1Gl2kecNaZqadotJeENW +lAQ== X-Gm-Message-State: AOAM531sW1bgAhD+kCpG/HiTJaH7zPRCzxbc00Eu225z01ig/SU5dZae Y94OP3osSr/glbRHCmHZItIoT5GTXNdCSg== X-Received: by 2002:aa7:9541:0:b029:32c:cefa:123f with SMTP id w1-20020aa795410000b029032ccefa123fmr17171474pfq.24.1626560337756; Sat, 17 Jul 2021 15:18:57 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id n14sm2405091pjv.34.2021.07.17.15.18.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jul 2021 15:18:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 08/13] target/avr: Advance pc in avr_tr_breakpoint_check Date: Sat, 17 Jul 2021 15:18:46 -0700 Message-Id: <20210717221851.2124573-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210717221851.2124573-1-richard.henderson@linaro.org> References: <20210717221851.2124573-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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: peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk, alex.bennee@linaro.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Since 0b00b0c1e05b, tb->size must not be zero. Advance pc so that the breakpoint covers the insn at the bp. Signed-off-by: Richard Henderson --- target/avr/translate.c | 1 + 1 file changed, 1 insertion(+) -- 2.25.1 Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/avr/translate.c b/target/avr/translate.c index 8237a03c23..d768063d65 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -2950,6 +2950,7 @@ static bool avr_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cs, DisasContext *ctx = container_of(dcbase, DisasContext, base); gen_breakpoint(ctx); + ctx->base.pc_next += 2; /* advance by minimum insn len so tb->size != 0 */ return true; }