From patchwork Mon Feb 28 18:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 546700 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp2970193imf; Mon, 28 Feb 2022 10:11:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpCJWrjiDGP3G7+oV51zVGRYSoq14tNgSh2C5LYtyCyoqsRFQhpwWwVoMnhzAu/QMKwFpj X-Received: by 2002:a0d:e68d:0:b0:2d0:e6b7:8b8a with SMTP id p135-20020a0de68d000000b002d0e6b78b8amr20428096ywe.409.1646071888616; Mon, 28 Feb 2022 10:11:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646071888; cv=none; d=google.com; s=arc-20160816; b=JvIfjZJc25uZjh9DabsmSlildfJgsguVzwZqDEDZhcJKciZcPAXaoLEciZKV64feYM Xu3ztWtHj+15kuuQUi3qh6zgqQBwMz8YJABNnlwTTZhMe4WaL3VI2SVeGsF94vEDArFI oNLMafl377BunayFMkPM2cVXslo4eE2+XOwMBTDQhcCJtNaxxNSa83kqeNJed5I5iUMv 09PjsvXe/5LsHfrSeh6LmL8BqEJzHjzFNzIyBo1s5xj7UKBxcMwRybDjJB2VPEqcjoTB u0m7tozME87RNaLfGIsCL/Ucqz9AZa7SFifrXI40RCt9v8C0AAUkbYm2zI2qel3m/vrs POKw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=S+mz2ogu1zcqrbgmqeDrINfOswx5azc/fcIK34KmvUM=; b=Hpkr/2ORGhSV9fHAvPmU7ZRvUNhYe6LLOtf3D4v5qG+IUOaZYyBLl68VlBMudqtp5X 6AquYjQuyVFMfFFzxrEdfBB6Giqcz6roAEZ7e00bsQLR+VJDc0KbyhPfuOtY3exHMC4O j1tetDstNd3j06DZTPlsfJ7VVtIJox19/dUO1vIBIT7nJUA/aAYV7ph1LIpP1yI/141Q L89X2z2OU+q6n7apmu3AwHrbS+LDOzoSJ+Fhb+oNgSlZzQ6iMqr28gWXLc09/we/v39d //q49OhsjJXeJhcSfNcWEKVu2YZrv0jHfXwB11ehCTbBZU3k7t9fjKVd3dJkThJYpkfq fubA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rqvEMRFK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.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. [209.51.188.17]) by mx.google.com with ESMTPS id k6-20020a056902070600b006282615736bsi4697935ybt.521.2022.02.28.10.11.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Feb 2022 10:11:28 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rqvEMRFK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.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 ([::1]:43140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOkUa-0004vt-3u for patch@linaro.org; Mon, 28 Feb 2022 13:11:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOkSb-0004un-Lk for qemu-devel@nongnu.org; Mon, 28 Feb 2022 13:09:25 -0500 Received: from [2607:f8b0:4864:20::52b] (port=36677 helo=mail-pg1-x52b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOkSZ-0005x1-T9 for qemu-devel@nongnu.org; Mon, 28 Feb 2022 13:09:25 -0500 Received: by mail-pg1-x52b.google.com with SMTP id t14so9310761pgr.3 for ; Mon, 28 Feb 2022 10:09:23 -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 :mime-version:content-transfer-encoding; bh=S+mz2ogu1zcqrbgmqeDrINfOswx5azc/fcIK34KmvUM=; b=rqvEMRFKaQ4+dZUawNzeK7xSfhNNzneor/GjwL8soCLrVJkqHQ5wmGrwB8mmqjgqDL HC93rqIr4YAkLE5KCxYe/AEelQY+klC7lyeVBsPsWqbD5O/A5BWAPvKrmf2U/hHXVJKq fj0ZOIfC8ll/KFRQ5pXIjoIy4G2CjDcs4ayAJ4Pk94T6z6jUhGKDIOPoGGKNz9rIP++c BAGCgNrF52e/uUU7T0tGIahf2SJs5Ohl/Q9tIhZSs16bo1V10OrbEH3tEZAjileUoNc3 zEGPk9xIViAtbdegJ4lcY+ZDu+XLgUHfvEzEpx7r+y8mRVqVUtC/2/SNpZFrZTuusD2x GjSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S+mz2ogu1zcqrbgmqeDrINfOswx5azc/fcIK34KmvUM=; b=Qx3qNLeR3q4EQvO3f/Jq0bVE6yetneT2uI7JYbCkp7dkgTReJUx4oTjX+xkiX+UQfN eM2P/C4WMPbzck84sOLCpV+iHmBEiXNfAkgN3szNSsDaaF15J13WG4HG6yZOPgZU6q4+ jzQq+hNy/cOVneUv6HsbDD7X8qE6WNhoIfWAe38nXzqcEXjuUBSwqPShtr+/q/EO4m+X h7VoV42BZPZpRgUCdU0OJxA56zmRX1t5dbelPhQ0PC5Knzf9rszSMrYr4ajRMeAq74C0 SPtFzlXm0nvdhkoK0FH/0kN12E5sPtxNTQ3J1kmLlN32IhnaGWT2EjcZ2kUVOKHqYGel qAjA== X-Gm-Message-State: AOAM530AjjK29h2Wi5BiQukZaiAu8GCTw9E5wOwM2fGuZmgZb6X+cjaa 8zgE0lvFMoikJW7Ss/7mEB9arH4kPuvNyg== X-Received: by 2002:a65:5888:0:b0:374:5575:ba08 with SMTP id d8-20020a655888000000b003745575ba08mr17969125pgu.375.1646071762552; Mon, 28 Feb 2022 10:09:22 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-483f-d486-138f-7868.res6.spectrum.com. [2603:800c:1201:c600:483f:d486:138f:7868]) by smtp.gmail.com with ESMTPSA id q24-20020aa79618000000b004e0e89985eesm13463223pfg.156.2022.02.28.10.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 10:09:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/3] tcg: Remove dh_alias indirection for dh_typecode Date: Mon, 28 Feb 2022 08:09:16 -1000 Message-Id: <20220228180918.38188-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228180918.38188-1-richard.henderson@linaro.org> References: <20220228180918.38188-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::52b (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Keith Packard , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Christian Ehrhardt Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The dh_alias redirect is intended to handle TCG types as distinguished from C types. TCG does not distinguish signed int from unsigned int, because they are the same size. However, we need to retain this distinction for dh_typecode, lest we fail to extend abi types properly for the host call parameters. This bug was detected when running the 'arm' emulator on an s390 system. The s390 uses TCG_TARGET_EXTEND_ARGS which triggers code in tcg_gen_callN to extend 32 bit values to 64 bits; the incorrect sign data in the typemask for each argument caused the values to be extended as unsigned values. This simple program exhibits the problem: static volatile int num = -9; static volatile int den = -5; int main(void) { int quo = num / den; printf("num %d den %d quo %d\n", num, den, quo); exit(0); } When run on the broken qemu, this results in: num -9 den -5 quo 0 The correct result is: num -9 den -5 quo 1 Fixes: 7319d83a735 ("tcg: Combine dh_is_64bit and dh_is_signed to dh_typecode") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/876 Reviewed-by: Alex Bennée Reported-by: Christian Ehrhardt Tested-by: Christian Ehrhardt Tested-by: Keith Packard Signed-off-by: Richard Henderson --- include/exec/helper-head.h | 19 ++++++++++--------- target/hppa/helper.h | 2 ++ target/i386/ops_sse_header.h | 3 +++ target/m68k/helper.h | 1 + target/ppc/helper.h | 3 +++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h index b974eb394a..734af067fe 100644 --- a/include/exec/helper-head.h +++ b/include/exec/helper-head.h @@ -53,13 +53,16 @@ # ifdef TARGET_LONG_BITS # if TARGET_LONG_BITS == 32 # define dh_alias_tl i32 +# define dh_typecode_tl dh_typecode_i32 # else # define dh_alias_tl i64 +# define dh_typecode_tl dh_typecode_i64 # endif # endif -# define dh_alias_env ptr # define dh_ctype_tl target_ulong +# define dh_alias_env ptr # define dh_ctype_env CPUArchState * +# define dh_typecode_env dh_typecode_ptr #endif /* We can't use glue() here because it falls foul of C preprocessor @@ -92,18 +95,16 @@ #define dh_typecode_i64 4 #define dh_typecode_s64 5 #define dh_typecode_ptr 6 -#define dh_typecode(t) glue(dh_typecode_, dh_alias(t)) +#define dh_typecode_int dh_typecode_s32 +#define dh_typecode_f16 dh_typecode_i32 +#define dh_typecode_f32 dh_typecode_i32 +#define dh_typecode_f64 dh_typecode_i64 +#define dh_typecode_cptr dh_typecode_ptr +#define dh_typecode(t) dh_typecode_##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_cptr dh_callflag_ptr #define dh_callflag_void 0 #define dh_callflag_noreturn TCG_CALL_NO_RETURN #define dh_callflag(t) glue(dh_callflag_, dh_alias(t)) diff --git a/target/hppa/helper.h b/target/hppa/helper.h index fe8a9ce493..c7e35ce8c7 100644 --- a/target/hppa/helper.h +++ b/target/hppa/helper.h @@ -1,7 +1,9 @@ #if TARGET_REGISTER_BITS == 64 # define dh_alias_tr i64 +# define dh_typecode_tr dh_typecode_i64 #else # define dh_alias_tr i32 +# define dh_typecode_tr dh_typecode_i32 #endif #define dh_ctype_tr target_ureg diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index e68af5c403..cef28f2aae 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -30,6 +30,9 @@ #define dh_ctype_Reg Reg * #define dh_ctype_ZMMReg ZMMReg * #define dh_ctype_MMXReg MMXReg * +#define dh_typecode_Reg dh_typecode_ptr +#define dh_typecode_ZMMReg dh_typecode_ptr +#define dh_typecode_MMXReg dh_typecode_ptr DEF_HELPER_3(glue(psrlw, SUFFIX), void, env, Reg, Reg) DEF_HELPER_3(glue(psraw, SUFFIX), void, env, Reg, Reg) diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 9842eeaa95..0a6b4146f6 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -17,6 +17,7 @@ DEF_HELPER_4(cas2l_parallel, void, env, i32, i32, i32) #define dh_alias_fp ptr #define dh_ctype_fp FPReg * +#define dh_typecode_fp dh_typecode_ptr DEF_HELPER_3(exts32, void, env, fp, s32) DEF_HELPER_3(extf32, void, env, fp, f32) diff --git a/target/ppc/helper.h b/target/ppc/helper.h index ab008c9d4e..ae7d503fcf 100644 --- a/target/ppc/helper.h +++ b/target/ppc/helper.h @@ -127,9 +127,11 @@ DEF_HELPER_FLAGS_1(ftsqrt, TCG_CALL_NO_RWG_SE, i32, i64) #define dh_alias_avr ptr #define dh_ctype_avr ppc_avr_t * +#define dh_typecode_avr dh_typecode_ptr #define dh_alias_vsr ptr #define dh_ctype_vsr ppc_vsr_t * +#define dh_typecode_vsr dh_typecode_ptr DEF_HELPER_3(vavgub, void, avr, avr, avr) DEF_HELPER_3(vavguh, void, avr, avr, avr) @@ -708,6 +710,7 @@ DEF_HELPER_3(store_dbatu, void, env, i32, tl) #define dh_alias_fprp ptr #define dh_ctype_fprp ppc_fprp_t * +#define dh_typecode_fprp dh_typecode_ptr DEF_HELPER_4(DADD, void, env, fprp, fprp, fprp) DEF_HELPER_4(DADDQ, void, env, fprp, fprp, fprp)