From patchwork Tue Dec 25 20:55:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 154509 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5225794ljp; Tue, 25 Dec 2018 13:26:53 -0800 (PST) X-Google-Smtp-Source: ALg8bN6NGjjJGyx3EnSe/nz41E5R/8lcGlazZ+zIribbIChgxjXk/8JcWaSdhYle3TZGyI+smDeF X-Received: by 2002:a37:3081:: with SMTP id w123mr15007799qkw.321.1545773213838; Tue, 25 Dec 2018 13:26:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545773213; cv=none; d=google.com; s=arc-20160816; b=BXC99WzrhGuX8MVB/p/crOuRQgyXHCU4RQPWpCuwhVqi47stMXO2HH8jR4+zHYWThQ P6h2PSdrvypxDqHip85G6gHJsI3rmM6AjZXwhrUM/y4FSTJ61gGHrLf2q74sbo4eCBxr svCjp003hPmjxNfaWmx0r7j/oKZd9De+0VaSoMqR65yqHNdCa6AtsYFDFrMO6mRefEgn xZHST26jbsVWoy8fSkUtyBhkcym8kg1ChqnhFJujM6MXpq1Z0WMfT092PSsE0IdfW+4x zY5MewQBXtBVtlJ7d0RBjOilvswH4Xtbo5iTR5nWs893ofzWnElEmxyEQ0eCP9qjyXv4 Ok5w== 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; bh=tgsB+66FSwCGkT6RnpcoeQQGYVHWLEls1whIS1khbVs=; b=zS1pIEQXXI4qMett7UWlBPEb6mjArECVU4Ye8w+Gd6WNv33PqM7avsEFh1/bnPMZ3u qAP5WdlCpRrgdiB1tFGz7Bv5hq/0hVh5v5E0zQiAbKe1RcG7Ike5qWELJf3JUlZsKKY/ xHwWwweZdKTRdgR+IaXPuPVXMEWPWl3bINyvsclUvlmp2ufInE9leZCHLK70iTR2aiip 6rD0V44zdTo3dx42qhltNsTViwZ2cJLRkJrb0ThnVdxBkzcO8AKLxXMjStFlX3tOd0+G oCN/DGw+EKJWVgANsmKl//XV9BuS3/PdH6xAJBH4o8Kv46O/vwdtL5VUmC63Cky0y4ZX teLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DBptIDsA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.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. [208.118.235.17]) by mx.google.com with ESMTPS id k34si1019888qtf.286.2018.12.25.13.26.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Dec 2018 13:26:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DBptIDsA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.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 ([127.0.0.1]:43363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbuE1-0000pf-CI for patch@linaro.org; Tue, 25 Dec 2018 16:26:53 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtn7-0007Ca-Gk for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbtn5-0000sT-CG for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:05 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:33765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbtn3-0000pR-9Q for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:03 -0500 Received: by mail-pl1-x632.google.com with SMTP id z23so6817811plo.0 for ; Tue, 25 Dec 2018 12:59:00 -0800 (PST) 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=tgsB+66FSwCGkT6RnpcoeQQGYVHWLEls1whIS1khbVs=; b=DBptIDsA2Vml+Mmgd188XC83pk4d2gzbYqUm6J/QR3RscCxTdFIZ0fWOrbx6RniBlA GsiTcQmCPOdHXs0Tt77/5fteiGm6fEskz0ANsOklJ7mGbKUeeovYdUC1abHsta+610+U RZW0taLdA39lzUwt41PixMVrh06uvaA8Dy0Y0= 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=tgsB+66FSwCGkT6RnpcoeQQGYVHWLEls1whIS1khbVs=; b=scucFUYKn961Ut9s2YsG4wGP5PixvfpsbkmCqOQntQ4ONX8lB0WZo/++5W91T2OS4M eyzt+/uz/m5H0uX5L9uXIAvkc7OF9McucfgNNJG6Jg6u6QFKr2Mil3anZEEP/+c5dxbw d1MxlfXaBiG94CbmOsI6hz/57Z3QRJozRvsL1tGvaB+9Z+naGNHujXUP3msQTv075LEZ mNBEGOOcd1jFpjUYD9DqIa/+Jh8iPxEyA/NRQM5d+K15X/yqStwhICSwfSB9GOXiVXFf 2fuXuUkjr6pfi7Oih6WT9tste3ZMjq/PHS+Fy0HwxyiwYlvHzyNanFhWfa/TLNbkmvuB KkCg== X-Gm-Message-State: AJcUukeGV5D+83nz1XkfoympsGBz5czniNExOANRKEl3PchmeLMwxR/F OIKX4TFIiQ9WnfkPB3bsw8UV55ALVX4= X-Received: by 2002:a17:902:209:: with SMTP id 9mr17693955plc.288.1545771539343; Tue, 25 Dec 2018 12:58:59 -0800 (PST) Received: from cloudburst.home (c211-28-135-144.sunsh3.vic.optusnet.com.au. [211.28.135.144]) by smtp.gmail.com with ESMTPSA id t21sm48501628pgg.24.2018.12.25.12.58.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Dec 2018 12:58:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 07:55:14 +1100 Message-Id: <20181225205529.10874-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181225205529.10874-1-richard.henderson@linaro.org> References: <20181225205529.10874-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::632 Subject: [Qemu-devel] [PULL 27/42] tcg: Add TCG_CALL_NO_RETURN 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Remember which helpers have been marked noreturn. Reviewed-by: Emilio G. Cota Signed-off-by: Richard Henderson --- include/exec/helper-head.h | 13 +++++++++++++ include/exec/helper-tcg.h | 21 ++++++++++++++------- tcg/tcg.h | 2 ++ 3 files changed, 29 insertions(+), 7 deletions(-) -- 2.17.2 diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h index 276dd5afce..ab4f8b6623 100644 --- a/include/exec/helper-head.h +++ b/include/exec/helper-head.h @@ -108,6 +108,19 @@ #define dh_is_signed_env dh_is_signed_ptr #define dh_is_signed(t) dh_is_signed_##t +#define dh_callflag_i32 0 +#define dh_callflag_s32 0 +#define dh_callflag_int 0 +#define dh_callflag_i64 0 +#define dh_callflag_s64 0 +#define dh_callflag_f16 0 +#define dh_callflag_f32 0 +#define dh_callflag_f64 0 +#define dh_callflag_ptr 0 +#define dh_callflag_void 0 +#define dh_callflag_noreturn TCG_CALL_NO_RETURN +#define dh_callflag(t) glue(dh_callflag_, dh_alias(t)) + #define dh_sizemask(t, n) \ ((dh_is_64bit(t) << (n*2)) | (dh_is_signed(t) << (n*2+1))) diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index b3bdb0c399..268e0f804b 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -11,36 +11,43 @@ #define str(s) #s #define DEF_HELPER_FLAGS_0(NAME, FLAGS, ret) \ - { .func = HELPER(NAME), .name = str(NAME), .flags = FLAGS, \ + { .func = HELPER(NAME), .name = str(NAME), \ + .flags = FLAGS | dh_callflag(ret), \ .sizemask = dh_sizemask(ret, 0) }, #define DEF_HELPER_FLAGS_1(NAME, FLAGS, ret, t1) \ - { .func = HELPER(NAME), .name = str(NAME), .flags = FLAGS, \ + { .func = HELPER(NAME), .name = str(NAME), \ + .flags = FLAGS | dh_callflag(ret), \ .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) }, #define DEF_HELPER_FLAGS_2(NAME, FLAGS, ret, t1, t2) \ - { .func = HELPER(NAME), .name = str(NAME), .flags = FLAGS, \ + { .func = HELPER(NAME), .name = str(NAME), \ + .flags = FLAGS | dh_callflag(ret), \ .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) }, #define DEF_HELPER_FLAGS_3(NAME, FLAGS, ret, t1, t2, t3) \ - { .func = HELPER(NAME), .name = str(NAME), .flags = FLAGS, \ + { .func = HELPER(NAME), .name = str(NAME), \ + .flags = FLAGS | dh_callflag(ret), \ .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) }, #define DEF_HELPER_FLAGS_4(NAME, FLAGS, ret, t1, t2, t3, t4) \ - { .func = HELPER(NAME), .name = str(NAME), .flags = FLAGS, \ + { .func = HELPER(NAME), .name = str(NAME), \ + .flags = FLAGS | dh_callflag(ret), \ .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) }, #define DEF_HELPER_FLAGS_5(NAME, FLAGS, ret, t1, t2, t3, t4, t5) \ - { .func = HELPER(NAME), .name = str(NAME), .flags = FLAGS, \ + { .func = HELPER(NAME), .name = str(NAME), \ + .flags = FLAGS | dh_callflag(ret), \ .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) \ | dh_sizemask(t5, 5) }, #define DEF_HELPER_FLAGS_6(NAME, FLAGS, ret, t1, t2, t3, t4, t5, t6) \ - { .func = HELPER(NAME), .name = str(NAME), .flags = FLAGS, \ + { .func = HELPER(NAME), .name = str(NAME), \ + .flags = FLAGS | dh_callflag(ret), \ .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) \ | dh_sizemask(t5, 5) | dh_sizemask(t6, 6) }, diff --git a/tcg/tcg.h b/tcg/tcg.h index d9b101e2f8..492d8dcf10 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -467,6 +467,8 @@ typedef TCGv_ptr TCGv_env; #define TCG_CALL_NO_WRITE_GLOBALS 0x0002 /* Helper can be safely suppressed if the return value is not used. */ #define TCG_CALL_NO_SIDE_EFFECTS 0x0004 +/* Helper is QEMU_NORETURN. */ +#define TCG_CALL_NO_RETURN 0x0008 /* convenience version of most used call flags */ #define TCG_CALL_NO_RWG TCG_CALL_NO_READ_GLOBALS