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: 912364 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="gQWwoYmh"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40jZY16SbYz9s02 for ; Sat, 12 May 2018 15:00:53 +1000 (AEST) Received: from localhost ([::1]:45331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHMeJ-0007W5-Ec for incoming@patchwork.ozlabs.org; Sat, 12 May 2018 01:00:51 -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-Google-Smtp-Source: AB8JxZq/DvkEJqIk/THeuKRRfPEEWdP3QG9rbN/3RdnQI9JPS68X9zted2g85VzUP+Wpis3QaIiqoA== 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+incoming=patchwork.ozlabs.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(-) 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; }