From patchwork Wed May 19 18:30:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 442495 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1595262jac; Wed, 19 May 2021 11:53:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0y64OCqso2qRvfUOfihOaLWWa9AVT58WuW4e2D1c4gyrc6NqCWlAeLcTLhj+tNCym2YFp X-Received: by 2002:a02:a19c:: with SMTP id n28mr491651jah.117.1621450425297; Wed, 19 May 2021 11:53:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621450425; cv=none; d=google.com; s=arc-20160816; b=iI++WrMuSfOS40ybKKQcrDToxHFmnuvgFVoMHHZC49fEWoStUp10gUNmy1TjOAkuAA vYR+ytn6QGzOmnj1VMzFB8U6rj3+KtNeDEXP37h7qxRYTTaLiAkO1H0FcQ8vXvmnYfOA GJ8mQvI+5jGKAiEpYplTrN0Th4fR0ZyEIUFeytjV2ML5oRR2aSnhMPw/L4+sD2W/elCn EMSBPRSgNsfhx8HpLgkR53CyHK8wmIwBkQFYsYjZ17WGT8ARVJlLdZDKqL1E0b/tav6C JNJLEq6GinqomuQokyTwEAE4oXvrEr2HScvLEFu8VI7yP/EcsurQso+XiZsB2NNDAsZK LRKA== 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=YE5gh1RAZElW6rE0tgb4yyRWs9xDRZvjDM9uycPY9fA=; b=L2ug9x6bVnmI5C9mvgc2Jw6omM67A0UDLhXgoWU4uZOTqM87ZCAjexfh2T/L+78MuI KGJVyLCg6WmCvD1Cmef0r9/DM3ArwZGIGtR5zhvZZF1swDcjABT8/mel+1mgKUAasQ9v EhyEOVcnpEyY5LO1cVDY1k7dO3kbpVDD2bEjsFjimu0c3K4XaaEnYJpAFM1bgg8GrKHj Ym/Xv0p9CMkkXniwmf46BlXty9B2yXf02x07vBnyA897MsdwKzm0YGYV6x9RhYr0vbiS 3t4q4PuoVmpEiU2+T+LpzXehfH2uKMQjVtafKbacnX1FEADfR9kE1LNtoEalGkMtrwd/ hh3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XAiXHmeF; 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=pass (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 k6si424706ilo.39.2021.05.19.11.53.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 May 2021 11:53:45 -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=pass header.i=@linaro.org header.s=google header.b=XAiXHmeF; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljRKC-0001JP-Lx for patch@linaro.org; Wed, 19 May 2021 14:53:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljQyu-0004Xv-Gm for qemu-devel@nongnu.org; Wed, 19 May 2021 14:31:44 -0400 Received: from mail-oo1-xc31.google.com ([2607:f8b0:4864:20::c31]:44796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljQyd-0005oC-Tc for qemu-devel@nongnu.org; Wed, 19 May 2021 14:31:44 -0400 Received: by mail-oo1-xc31.google.com with SMTP id s24-20020a4aead80000b02901fec6deb28aso3212243ooh.11 for ; Wed, 19 May 2021 11:31:27 -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=YE5gh1RAZElW6rE0tgb4yyRWs9xDRZvjDM9uycPY9fA=; b=XAiXHmeFNAdV33zpYz5y6O98ZuvnwugHgfif+qPk3fyhOXba1ffovj+avuagY6SBJk x/iKkZQTiI3i+ZJzpYdHlcpzHLDvtIaJYTxkxUmjj/mfFi4dkUzz4BywGWQTqoYVPIBm R6O3oDz+Zno9IN63c3FwasRvf4QNDkg6IT73MGPEia52rfOxi/Qm7OFmX0FaTWhLxrmL tfLT6AWYELJZXTayHWL2Amx37IOyGzHV26dQ8YFD8Ut957/Khg7yWnN8qqN6H+cl+i4b ysrtDPUrT+mqkKgG3cWuONXW7kYT2RbaGqWRUKVhV4xLJK/VUEiC77UwQK6tupwFRAI2 nsqg== 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=YE5gh1RAZElW6rE0tgb4yyRWs9xDRZvjDM9uycPY9fA=; b=mE+DPBS/yoCzv3RhCDgs62ZSKotsaruc3E2L/FySGwLCmWGvNUz6ebrHtImTbYW2w8 rB9xkKt0JECNXC7esD6ra7/3miEsqmBU7kbisxfqjeCdX4zzrSUUsKZvBleJQIi3Df/8 dZEVb3bZuk7bEHAMtDTThFC7UVHptRcRCiFDtTyD1Hpmwu5az3sn4AkcWp37uH8q/Exu O2/ONNB8J7um4gQk4xRwtgXsV5L3P6M9rLJsYPYo91/D5g4qbXC4rdnOHr6wnuQF/DJl ZcBX9j7wBjY3uiUj3sNuadV/M5Ng23ZEFKastOyEK5RcEVFPRZM4boF69w+zYkXnjXN+ WVzw== X-Gm-Message-State: AOAM531EFELRAH9/i9Lmkg5J2hCVO8iLESskvuCWUoqfs+cfrP/8JeyK 93PZTnfF26e/EYJ7q5J4Uy63eK9t0W9qsG9t X-Received: by 2002:a4a:97ed:: with SMTP id x42mr564923ooi.40.1621449086664; Wed, 19 May 2021 11:31:26 -0700 (PDT) Received: from localhost.localdomain ([45.235.253.15]) by smtp.gmail.com with ESMTPSA id l9sm28428oou.43.2021.05.19.11.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:31:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 35/50] target/i386: Simplify gen_debug usage Date: Wed, 19 May 2021 13:30:35 -0500 Message-Id: <20210519183050.875453-36-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210519183050.875453-1-richard.henderson@linaro.org> References: <20210519183050.875453-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::c31; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc31.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, Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Both invocations pass the start of the current instruction, which is available as s->base.pc_next. The function sets is_jmp, so we can eliminate a second setting. Signed-off-by: Richard Henderson Reviewed-by: Paolo Bonzini Message-Id: <20210514151342.384376-36-richard.henderson@linaro.org> --- target/i386/tcg/translate.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.25.1 diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index c1d4d58c61..36e38ebebf 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2614,10 +2614,10 @@ static void gen_interrupt(DisasContext *s, int intno, s->base.is_jmp = DISAS_NORETURN; } -static void gen_debug(DisasContext *s, target_ulong cur_eip) +static void gen_debug(DisasContext *s) { gen_update_cc_op(s); - gen_jmp_im(s, cur_eip); + gen_jmp_im(s, s->base.pc_next - s->cs_base); gen_helper_debug(cpu_env); s->base.is_jmp = DISAS_NORETURN; } @@ -7152,7 +7152,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) #ifdef WANT_ICEBP case 0xf1: /* icebp (undocumented, exits to external debugger) */ gen_svm_check_intercept(s, pc_start, SVM_EXIT_ICEBP); - gen_debug(s, pc_start - s->cs_base); + gen_debug(s); break; #endif case 0xfa: /* cli */ @@ -8586,8 +8586,7 @@ static bool i386_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cpu, /* If RF is set, suppress an internally generated breakpoint. */ int flags = dc->base.tb->flags & HF_RF_MASK ? BP_GDB : BP_ANY; if (bp->flags & flags) { - gen_debug(dc, dc->base.pc_next - dc->cs_base); - dc->base.is_jmp = DISAS_NORETURN; + gen_debug(dc); /* The address covered by the breakpoint must be included in [tb->pc, tb->pc + tb->size) in order to for it to be properly cleared -- thus we increment the PC here so that