From patchwork Sat May 12 04:59:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135624 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1749920lji; Fri, 11 May 2018 22:00:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoCmW8xnwojbFvjlARR9miANaFG35+57YRS+wHQhOJV/7hO459u9p5pSLawfnBhAs/fmwev X-Received: by 2002:a0c:9e05:: with SMTP id p5-v6mr1130945qve.136.1526101227552; Fri, 11 May 2018 22:00:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526101227; cv=none; d=google.com; s=arc-20160816; b=WoRwffJcjdn32HBjv5zzZmSv82TlE4/eQ9TuZeTnCG1F/cSeeNRA4QxnX9Fg82SgMz wVqikW3LtLSuxe2B19jOehyHd/wpEpQv4vM1EFu7Bdt4jvqnc5uVP7o4cjmks2HyWnkI sR2Oz+IUctC6yRQVopCjMEcJcVQwkPrLYDnoz6Kw2zsjh68qNJbv3pxPTERTTK8cIogU a4xIZOgrKJKGWnLsEnUGjf4BveGd6GqwBLkonZK1mM77Wt6Wvti3BhdT5ZWAPfQtHKoX 3VOu7vk7iTM5xJJ0vAGTT1nQX0cAYPVury5HVIkeBCM1L+7BN2GE6Ztj/xyXiReU+aaS CKVg== 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=J1iP2GOQCUPJduae4frChuUcwr1CzzvTx/XAWYc4oUN6v3F1uc1V1VLluOja66IopC gNTTKcQZMcJHE5sLMuc2An3kPodDma2Taa0Nm77EVxTwB+Y/jDHr+qQuKLoKPPbeTbaL pFcy7fbJZfTIgCv6RGDwPhphqnwmuxdwAp2sc4iTGKUfI3cp3C7twxBKsah2SJJplMbP hUHsgdWZqBgV1DRGU/KHuQy+VTYTxtNleB0K6K5/Ws6fCdqyUfcUpR+lqH01VPUvq2m4 dopCwsgSw6uC5oDktMY60pn99r0bYm7vCLD//HbtAoRUghKmO4gOBfomNIsKmbVUk7AF CgTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gQWwoYmh; 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 h68-v6si1821570qkc.22.2018.05.11.22.00.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 May 2018 22:00:27 -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=gQWwoYmh; 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]:45331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHMdu-0007W5-WE for patch@linaro.org; Sat, 12 May 2018 01:00:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHMdU-0007Mv-2I for qemu-devel@nongnu.org; Sat, 12 May 2018 01:00:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fHMdR-0007K5-Vu for qemu-devel@nongnu.org; Sat, 12 May 2018 01:00:00 -0400 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:38183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fHMdR-0007Jv-PT for qemu-devel@nongnu.org; Sat, 12 May 2018 00:59:57 -0400 Received: by mail-pl0-x243.google.com with SMTP id c11-v6so4377079plr.5 for ; Fri, 11 May 2018 21:59:57 -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=gQWwoYmh81GWPh0PRevxa8DYsTm2mxHrGOu+JJz8YAJ36mkT4hS+MCCczkFiZyQrW6 V6VMO0LjPsVvGO5WYT9DJiFihu+tjHp98aFZpH9+DzRacqgZPombMXCMK30CG+vTJZ3U ZKpo7SHEsNE+nj639lOvsAO5hd9BaZ7ojGu7k= 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=K8ioPA9PE/V5myJp/iEUH7evxQ5InPo/dW9OHD8a5R7LfTvT+F63Mk5RErv3+GMwEc U/VJVf3NaeRmGXggO7VtL1XrczLVQQZ5o0hXYmB+dFcGFYvtY63u+PFzRbKnyEcT2DGD J7Idsxrk3qXO0+f6Ds44ZLNDs4QI/iqi3y/aq9ceD89V9kROguSb+xhIpy4ifHD0qaFj DJ7wIZh8ztfVLTVN7naBv7jybUEmgJGTHnSQVBUla31DYmov6CiX6nu0IMgPgYMMfk3l nU2maPk8jk3//lp4qz6+4tJ8h9ei2PB9OKKDFeBUICg3f95mVygXMBCTi+CAre/6eoIc gFXg== X-Gm-Message-State: ALKqPwdFser4drCRS6dmvTAstphnRPX8kYwo0AyTaDVsnzcIb+zEFqMC XQVG2lOefKCXlHkFth+cr7vNMpfGrRo= X-Received: by 2002:a17:902:343:: with SMTP id 61-v6mr1025604pld.39.1526101196429; Fri, 11 May 2018 21:59:56 -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 b5-v6sm7057551pgc.16.2018.05.11.21.59.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 May 2018 21:59:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 11 May 2018 21:59:41 -0700 Message-Id: <20180512045950.12386-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180512045950.12386-1-richard.henderson@linaro.org> References: <20180512045950.12386-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::243 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; }