From nobody Mon Feb 9 17:59:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591907341; cv=none; d=zohomail.com; s=zohoarc; b=jvTo6535A2zCs2+HYFKnDGO6sU6qRZnHPPcm63Ul/e+qz/JtoJKFbtLpezk0syQD/usXccISPZudyBK7Ih6g6fgDEell0lyGI5u0NBJYXGnmd156K8gxEFlq9U0WPq5Y8jGPVs6iTCorYVnIxmbJ2m5d2ELuUeyZI/ApUFx3jq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591907341; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fc5C2D8Qy2Ifc39GMfOK5qBTqHLI5bHmpAMB0Ujy/Lk=; b=LTO5Vk3UFG+kY494vLSmnjGOyxo932AXVVAW00WrYXB56Tax7jVEnTwc0Q4iT3Qf6D/LnCNRsL9/c+wP+c/vOCqsa8yJwzSnLcHiZb4i1S88GB54bmTr0DbnxrZ6x106Cn6hmYTas5MV7+k2dJ8+iY0hzqCTFIirPltQdYuNYTQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159190734181483.71900509140869; Thu, 11 Jun 2020 13:29:01 -0700 (PDT) Received: from localhost ([::1]:53830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjToq-0003MB-Ik for importer@patchew.org; Thu, 11 Jun 2020 16:29:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjT92-00086h-UR for qemu-devel@nongnu.org; Thu, 11 Jun 2020 15:45:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49227 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jjT8z-00018D-7i for qemu-devel@nongnu.org; Thu, 11 Jun 2020 15:45:48 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-179-nI6nhJbQOjut-Qr7L6Todg-1; Thu, 11 Jun 2020 15:45:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2744819067F2; Thu, 11 Jun 2020 19:45:41 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD8C662502; Thu, 11 Jun 2020 19:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591904744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fc5C2D8Qy2Ifc39GMfOK5qBTqHLI5bHmpAMB0Ujy/Lk=; b=B/kNrv1qN3Mh2rltT1RqWBhWl0vIFTRjjI151bqZuGUBFBSbT5tCUJh2yB4r91ZdhK056f myVna3pnUiXUtorH8j5pD1RReI6Ud4UuKiYNduv9ZavhEEqI8BQUbhTVOAN/Vl9AWFxVuA tbS/2PLfnCIGcu6cv+T1TMdjZ/amgZ4= X-MC-Unique: nI6nhJbQOjut-Qr7L6Todg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 063/115] target/i386: fix fbstp handling of out-of-range values Date: Thu, 11 Jun 2020 15:43:57 -0400 Message-Id: <20200611194449.31468-64-pbonzini@redhat.com> In-Reply-To: <20200611194449.31468-1-pbonzini@redhat.com> References: <20200611194449.31468-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 08:37:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joseph Myers Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Joseph Myers The fbstp implementation fails to check for out-of-range and invalid values, instead just taking the result of conversion to int64_t and storing its sign and low 18 decimal digits. Fix this by checking for an out-of-range result (invalid conversions always result in INT64_MAX or INT64_MIN from the softfloat code, which are large enough to be considered as out-of-range by this code) and storing the packed BCD indefinite encoding in that case. Signed-off-by: Joseph Myers Message-Id: Signed-off-by: Paolo Bonzini --- target/i386/fpu_helper.c | 10 +++ tests/tcg/i386/test-i386-fbstp.c | 115 +++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) diff --git a/target/i386/fpu_helper.c b/target/i386/fpu_helper.c index f0a57099ca..41f6f391ca 100644 --- a/target/i386/fpu_helper.c +++ b/target/i386/fpu_helper.c @@ -732,6 +732,16 @@ void helper_fbst_ST0(CPUX86State *env, target_ulong pt= r) =20 val =3D floatx80_to_int64(ST0, &env->fp_status); mem_ref =3D ptr; + if (val >=3D 1000000000000000000LL || val <=3D -1000000000000000000LL)= { + float_raise(float_flag_invalid, &env->fp_status); + while (mem_ref < ptr + 7) { + cpu_stb_data_ra(env, mem_ref++, 0, GETPC()); + } + cpu_stb_data_ra(env, mem_ref++, 0xc0, GETPC()); + cpu_stb_data_ra(env, mem_ref++, 0xff, GETPC()); + cpu_stb_data_ra(env, mem_ref++, 0xff, GETPC()); + return; + } mem_end =3D mem_ref + 9; if (SIGND(temp)) { cpu_stb_data_ra(env, mem_end, 0x80, GETPC()); diff --git a/tests/tcg/i386/test-i386-fbstp.c b/tests/tcg/i386/test-i386-fb= stp.c index d368949188..73bf56b9dc 100644 --- a/tests/tcg/i386/test-i386-fbstp.c +++ b/tests/tcg/i386/test-i386-fbstp.c @@ -1,8 +1,19 @@ /* Test fbstp instruction. */ =20 +#include #include #include =20 +union u { + struct { uint64_t sig; uint16_t sign_exp; } s; + long double ld; +}; + +volatile union u ld_invalid_1 =3D { .s =3D { 1, 1234 } }; +volatile union u ld_invalid_2 =3D { .s =3D { 0, 1234 } }; +volatile union u ld_invalid_3 =3D { .s =3D { 0, 0x7fff } }; +volatile union u ld_invalid_4 =3D { .s =3D { (UINT64_C(1) << 63) - 1, 0x7f= ff } }; + int main(void) { int ret =3D 0; @@ -21,5 +32,109 @@ int main(void) printf("FAIL: fbstp -0.1\n"); ret =3D 1; } + memset(out, 0x1f, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (-987654321987654321= .0L) : + "st"); + out[9] &=3D 0x80; + if (memcmp(out, "\x21\x43\x65\x87\x19\x32\x54\x76\x98\x80", + sizeof out) !=3D 0) { + printf("FAIL: fbstp -987654321987654321\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (999999999999999999.= 5L) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp 999999999999999999.5\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (1000000000000000000= .0L) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp 1000000000000000000\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (1e30L) : "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp 1e30\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (-999999999999999999= .5L) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp -999999999999999999.5\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (-100000000000000000= 0.0L) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp -1000000000000000000\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (-1e30L) : "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp -1e30\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (__builtin_infl()) := "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp inf\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (-__builtin_infl()) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp -inf\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (__builtin_nanl(""))= : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp nan\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (-__builtin_nanl("")= ) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp -nan\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (ld_invalid_1.ld) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp invalid 1\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (ld_invalid_2.ld) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp invalid 2\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (ld_invalid_3.ld) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp invalid 3\n"); + ret =3D 1; + } + memset(out, 0x12, sizeof out); + __asm__ volatile ("fbstp %0" : "=3Dm" (out) : "t" (ld_invalid_4.ld) : + "st"); + if (memcmp(out, "\0\0\0\0\0\0\0\xc0\xff\xff", sizeof out) !=3D 0) { + printf("FAIL: fbstp invalid 4\n"); + ret =3D 1; + } return ret; } --=20 2.26.2