From nobody Sat Jul 1 21:44:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qtm0j030yz4jvnM; Sat, 1 Jul 2023 21:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qtm0h6Kh6z45sh; Sat, 1 Jul 2023 21:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688247844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V8n4/zVOk2YdRgFiAIn0VIYp6ZWA3QDWASxCAQ/GmE8=; b=miOVOvVFmfQ8L4mv1UvB2UW2N57fC+9JTWeMywoEbK0mhpPobGjLR5fglW2rYr15tFAsYf 0E+7rZSd6eCQZOlkPWpODbH73nFrkZtUhB11Eiz0Xftj+3v372MfjBEVuGxCAf0yRutBIl b6waidnugoVVscMo0orO9H46zTFe8/G0P/AjO992pZYtOJmKp1OSGND9H4WDDO8a4uK6rH +HhaNU0wWZyh0P5LsWSpymsPnKbPy/0cok3g1d1qNM0gmUXFRC3Y0fUBnY0UJuaIh+//4w Z6t2WrnnnvEIhLd1oRWk8ClgAOZvYu6UrrIwsm2ZwMs5fU6mjTxzvTBJMG+mlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688247844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V8n4/zVOk2YdRgFiAIn0VIYp6ZWA3QDWASxCAQ/GmE8=; b=B/OV9BVVfOZdQ9u93c4zQtm1pk1Y22GhUnb2+ZgpvUpV0Kkn667GyIF8gcVttfsnowZ0Cu wiuypoYCJ6NNJfv5RvlRj6cAXahbgIGhs0+K9fE/kUNkHq2h5rYjv3uyijnFxwE1Qn2pfu mZvQLI6fkaxfXu+oxZvG8fp01EUp2AqeWB28qDZ5qRxiUS3ZWeACH/ewPtNPQYB188EA53 gLjxkYN5ihrQ/TlYclNaKMeev0hdSYEi6kmo4/DhQFDnRMM3t2Je9CzGGE0HNOs23iBdQf IIDqgLJ6BmBxtLkz3ZUBJMQWwzZpq1AaZCISdS6NFijn/56tcT7XNa+kqBSoGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688247844; a=rsa-sha256; cv=none; b=ZqTjE45FDk7bMgukoBM5mchVWKESj2mbgiiCJQQa2c75D7zV+XCTURXSt5BCIhQiFqnox8 tzfk+jTP4GzIgFulrimPhw9hfWX3nUo/xCRI2Y3QrdWORXhr71BQqiSYiiXKV9WcMTRuxL hP8obsgaNmVNOP9vCphqbH0kDPL1Xjm9A7Xn21adgnwF3kywfUGqJra0mEbU4NNo7A+2fa 9tsDhsFpaHqoIS9iXqDS6FJflcjigQRxWupLY14YVEajtr8Ds4CQ+PvjbGxAuP8XUMkPv0 CEP5KoivKr8CmV2vPpHNTDM63jWy6ok38FP0siIxMP1wHYFFkKag61KtxI0pWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qtm0h5NZgzhmf; Sat, 1 Jul 2023 21:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361Li45t001612; Sat, 1 Jul 2023 21:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361Li4DX001611; Sat, 1 Jul 2023 21:44:04 GMT (envelope-from git) Date: Sat, 1 Jul 2023 21:44:04 GMT Message-Id: <202307012144.361Li4DX001611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: df11fb9bf042 - main - divmoddi4: Handle negative remainders. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df11fb9bf0421ad11cfbc8834ca393a1a0c2748d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=df11fb9bf0421ad11cfbc8834ca393a1a0c2748d commit df11fb9bf0421ad11cfbc8834ca393a1a0c2748d Author: John Baldwin AuthorDate: 2023-07-01 21:43:41 +0000 Commit: John Baldwin CommitDate: 2023-07-01 21:43:41 +0000 divmoddi4: Handle negative remainders. The sign of the remainder matches the sign of the numerator in C. Reported by: jrtc27 Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D40832 --- sys/libkern/divmoddi4.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/libkern/divmoddi4.c b/sys/libkern/divmoddi4.c index e5bd81a90ad7..7c0a6a690f24 100644 --- a/sys/libkern/divmoddi4.c +++ b/sys/libkern/divmoddi4.c @@ -43,18 +43,18 @@ quad_t __divmoddi4(quad_t a, quad_t b, quad_t *rem) { u_quad_t ua, ub, uq, urem; - int neg; + int negq, negr; if (a < 0) - ua = -(u_quad_t)a, neg = 1; + ua = -(u_quad_t)a, negq = 1, negr = 1; else - ua = a, neg = 0; + ua = a, negq = 0, negr = 0; if (b < 0) - ub = -(u_quad_t)b, neg ^= 1; + ub = -(u_quad_t)b, negq ^= 1; else ub = b; uq = __qdivrem(ua, ub, &urem); if (rem != 0) - *rem = urem; - return (neg ? -uq : uq); + *rem = negr ? -urem : urem; + return (negq ? -uq : uq); }