From patchwork Sat May 12 05:02:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135627 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1752426lji; Fri, 11 May 2018 22:03:42 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrn4vTzbHHfVFQbW/Z8XS4pnF073svh8BVAD9QsCHunbqZvI3xtz1aM9YZOgsFFQVZCciKc X-Received: by 2002:ac8:2f43:: with SMTP id k3-v6mr721976qta.389.1526101422694; Fri, 11 May 2018 22:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526101422; cv=none; d=google.com; s=arc-20160816; b=SIzNvPGD2AyDo4ASPjXMQj2g+z7zVD783kTSzFYawsOTJFLngNi1NlybOBo0jTEo6F 5suKzyIzcfCKrgz1Pnhx27I9FLiy7467oQqrnbozJdIij5ybLb2V490Bb6iy9r08+A2/ 3a/667hsVIxmv6IpwxtbEoMDsnhU8/lXL4Ff5c/9NvMV8GwQfchGXZopFPsV1wobbvF1 ZbjUAd97zAH1n/GKAcpHlvz8uFAv1+9xGNP9e/X0YBRo+Ry8FMDRzfrLplO9RpFS4PkJ j9oVe2ts1MX58ca3lw1uZhB71J1xdT3krdRzTdmgc93p3Lj5b1GV10BezEs0dNDN9zar HFAA== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=HmV49nLJ6y8U9749KyeDAFR/zUCT5hZAmZM9azYZbHQ=; b=NU++ixG2kt412wtRrDnyPZq74wh23WgdurWycNt4gv3cshSF5ekyIjRu+4YBkqDKpo jed0UPO1quwF7u8uf2YGDxaE7bKs3j9Fi67d48kz5UJ1F4Z1TMv6D/Aen0aZ5lcrvcOV jyAatHfFPoKXYGiExJbIjpWMlj3v9Z62dOFsXXSW/waiynmQSlQ73lV5b0aZu6tr32h6 TrM9ME2+4LWYBCXq5KKIinlrKx55+OJCusAEYLgjOgQuahUlWrP48Valydm6bH3lGzMm EiaVRQd55q+1pb04GLMaythJBywnLg9Ir6uADQTJltQL6ZFImjQ7AcyDLBSfN66Yd7SW 4xdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CM4IbaFl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b32-v6si4906547qta.275.2018.05.11.22.03.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 May 2018 22:03:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CM4IbaFl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:45381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHMh4-00042q-4e for patch@linaro.org; Sat, 12 May 2018 01:03:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHMgN-000414-US for qemu-devel@nongnu.org; Sat, 12 May 2018 01:03:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fHMgI-0008Ko-Ud for qemu-devel@nongnu.org; Sat, 12 May 2018 01:02:59 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:46305) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fHMgI-0008Kd-Ps for qemu-devel@nongnu.org; Sat, 12 May 2018 01:02:54 -0400 Received: by mail-pl0-x242.google.com with SMTP id 59-v6so4364872plc.13 for ; Fri, 11 May 2018 22:02:54 -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; bh=HmV49nLJ6y8U9749KyeDAFR/zUCT5hZAmZM9azYZbHQ=; b=CM4IbaFlSHDvcvzNBpyvUNec31P+IelX2ZrxPguee5RkChK5gD/tWcNigcwGiFoOun w9F+0XPi3Q/URQfBswvQE6AVRSNO/H5GmJ/ybuhvRbsuEx6YHk34CDtc1s4PuPjd7hYA bAr3FPJ2oAzeY8LvR83v44nfxnJJV8vIN6C+Q= 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; bh=HmV49nLJ6y8U9749KyeDAFR/zUCT5hZAmZM9azYZbHQ=; b=Qy6boQiP0MgEmPUuTrp3ozy16Ghg5Jizjq5nGGKCPPi3YsE9MyDuCTf/ystLLlA9Yx CoX03pVSdDPRQ1QC8TQqIjDmzuF/NRn+lYpIVTn7fxxMuJDGTT9T0ki/cbs+qiFsbG2y icya6JQIejAJN4EH5XgwUT3CZ/m8V+56gkyazSwi3i5bNXUlogyQIwQH1vOOrTrASY3A YcCAXCKoTwBLbem2ZYyK7r5scBkDelOJuS+CkeMXM4mvJWEFZPx4u7VgkYXBXXbq0gVg Ef/EkFzwuye7hN2bP0t/lw91EFzfHE60vmBDSjKI8Z8zKpGXQUwyVQCF92NkS5uS8sKU zx/A== X-Gm-Message-State: ALKqPwfMC5RzE0Ix7YQe98JHKN43SUFud34pa76ZridLGImXe2KT82wl QtWbqjOSzHk839RJJNGCPoDukmH34KM= X-Received: by 2002:a17:902:3e5:: with SMTP id d92-v6mr1078761pld.104.1526101373490; Fri, 11 May 2018 22:02:53 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id x124-v6sm8999945pfx.72.2018.05.11.22.02.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 May 2018 22:02:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 11 May 2018 22:02:42 -0700 Message-Id: <20180512050250.12774-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180512050250.12774-1-richard.henderson@linaro.org> References: <20180512050250.12774-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH 1/9] target/m68k: Use DISAS_NORETURN for exceptions 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.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The raise_exception helper does not return. Do not generate any code following that. Signed-off-by: Richard Henderson --- target/m68k/translate.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.17.0 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 44a0ac4e2e..86404906e0 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -291,18 +291,18 @@ static void gen_jmp(DisasContext *s, TCGv dest) s->is_jmp = DISAS_JUMP; } -static void gen_raise_exception(int nr) +static void gen_exception(DisasContext *s, uint32_t dest, int nr) { - TCGv_i32 tmp = tcg_const_i32(nr); + TCGv_i32 tmp; + update_cc_op(s); + tcg_gen_movi_i32(QREG_PC, dest); + + tmp = tcg_const_i32(nr); gen_helper_raise_exception(cpu_env, tmp); tcg_temp_free_i32(tmp); -} -static void gen_exception(DisasContext *s, uint32_t where, int nr) -{ - gen_jmp_im(s, where); - gen_raise_exception(nr); + s->is_jmp = DISAS_NORETURN; } static inline void gen_addr_fault(DisasContext *s) @@ -6106,7 +6106,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) { gen_exception(dc, dc->pc, EXCP_DEBUG); - dc->is_jmp = DISAS_JUMP; /* 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 @@ -6150,6 +6149,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) tcg_gen_exit_tb(0); break; case DISAS_TB_JUMP: + case DISAS_NORETURN: /* nothing more to generate */ break; }