From patchwork Mon Nov 26 23:04:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 152096 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp491422ljp; Mon, 26 Nov 2018 15:05:20 -0800 (PST) X-Google-Smtp-Source: AJdET5cl8dg48ZDfK6j0KdXd/+wy3XjlhFL1rmFr8dq/fHg3/+knFAk7XeRr51Xb1Wc7UNndbcar X-Received: by 2002:a81:b623:: with SMTP id u35mr31342272ywh.177.1543273520573; Mon, 26 Nov 2018 15:05:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543273520; cv=none; d=google.com; s=arc-20160816; b=bMtlU6Yyhtd8Cenvh855lENxPss/mAZyGPM4PwxeoPSls8tDQvKSfCN+3LgeiE1VeP W66VEAOOXYIRPJsla715883CnhX03l/tF7mt1qODFeagM/18Dgn8/wa3RBat4E6Hz0Hd Fq8IqcwdOSKNhJ3kjhCDHVB8af1KL5jjWatijVZMKWR+TYFd8KvL0SgCVQUD1JC62u7R ynin6YHVxfYQLUEjjMt52dwd43BwvzQw746wMojiqXLXPKbBwvKAFZrTOpZ4pG+zJCh9 7F520suz4vNktv638iP3bVDxLrVNCrXvOWiSoeNh0zTv8hCEo1INwOTmKvvENl4wjrbn lY8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=+rd8f0EuKeLcBkc84eNzbeuWs4zuLZUL/ehXCsMsyMI=; b=0hBL8XWBNaU0F1WXQ63ZzboEuPpU+STvhLh5l8xWTe0oaDuE0Pcw2LtcZ4oBDr17vE kT+fEFOwV6UPiwGtbqWUkJTuaINSqMsR48h70sNVPhP614HPoKKtni5xD9SUqaFQYAOU A27fLLjeY0XVyD48mEO6jWUUZLXQKKR8umf2MuiQZnWmKauJ3KRPwZAiMblIa7JBD1I4 gqSA4rjhtbACYI1oIOLrXAqUjj/p3f23IYvXrsYFIVEiQmA0K8ubbtsZEpbiUX0kaOJV 9joe3ac9wQ0k3yUU9A8C1GPfzIidocpzhcA0tP2AfZq0bVbk2DKUmoFR1c0wA3rOFGp4 +iwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KeNi0Hd9; 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 h66-v6si1221818yba.238.2018.11.26.15.05.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 26 Nov 2018 15:05:20 -0800 (PST) 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=KeNi0Hd9; 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]:39232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRPwO-0002ak-0K for patch@linaro.org; Mon, 26 Nov 2018 18:05:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRPw3-0002ZN-Rv for qemu-devel@nongnu.org; Mon, 26 Nov 2018 18:05:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRPw1-0000Gv-NX for qemu-devel@nongnu.org; Mon, 26 Nov 2018 18:04:59 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:46839) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRPw1-0000Gp-IL for qemu-devel@nongnu.org; Mon, 26 Nov 2018 18:04:57 -0500 Received: by mail-pg1-x542.google.com with SMTP id w7so6858742pgp.13 for ; Mon, 26 Nov 2018 15:04:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=+rd8f0EuKeLcBkc84eNzbeuWs4zuLZUL/ehXCsMsyMI=; b=KeNi0Hd9x55Vd/RffJf7qe1LHe+fRGIzspyfMVYNwNj1gMwrPiJVaq8HWSO7rqhbeU OGbTLU22Xi69gWvmmD3BJ1wCSE2VRHjHMLA9yVZQ+CBLJp8a3DcnOVhNMttSEZpqG9Ro atRJUAaFEbtTLz4ZA+4XFoe4HF3kwVezRjUn4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+rd8f0EuKeLcBkc84eNzbeuWs4zuLZUL/ehXCsMsyMI=; b=gXDaxb1l7McVat9rlRkZSIVEoG2Jfpb+menwcpzagcGLH2vJSjs2iekaaTABMx9vse VtuPUx3x6EhHKnaQUPnkoEQhRpbLMo4BstzL+RS5eWU0feRCAQmTCwrx9Yhf2XxbV3q7 zEwNV2OnEriQlbnF43RFMZOp03XrPkdV4vrwaoQQtb3xEBRHZTbipFhCS2XwqOju95uf 4aZbEdVHN6Kc8nPesIgtmL39gMZoXggsUxrcnGE6HMKTLDkjf00CEIJ3kDFhSY0tH1nF DILiykQ2uNelYjKmAROBNp85waZDxRjR464oNvTwksyi+vE5BriGfLzmWC5ihOHtozYa jJlg== X-Gm-Message-State: AA+aEWbPUPDWQI8p+340o6A70DJg6CfT3PoPzLt+GGfIH6BkxEynt321 WhFQRErQMUQlyFE7/ZLH+9dRt1oT6Yc= X-Received: by 2002:a65:55ca:: with SMTP id k10mr26600240pgs.448.1543273496225; Mon, 26 Nov 2018 15:04:56 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-170-180.tukw.qwest.net. [97.113.170.180]) by smtp.gmail.com with ESMTPSA id o13sm1798703pfk.57.2018.11.26.15.04.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Nov 2018 15:04:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2018 15:04:48 -0800 Message-Id: <20181126230450.672-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181126230450.672-1-richard.henderson@linaro.org> References: <20181126230450.672-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::542 Subject: [Qemu-devel] [PATCH 2/4] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Remember which helpers have been marked noreturn. 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 e94f805370..6b6bc75c82 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -469,6 +469,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