[pkgsrc/trunk]: pkgsrc/emulators/qemu fix to i386 div64 taken from qemu cvs

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c3a2ea4d34b
branches:  trunk
changeset: 502465:6c3a2ea4d34b
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Fri Nov 04 21:10:42 2005 +0000

description:
fix to i386 div64 taken from qemu cvs
bump PKGREVISION

diffstat:

 emulators/qemu/Makefile         |   4 ++--
 emulators/qemu/distinfo         |   3 ++-
 emulators/qemu/patches/patch-ay |  24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 14f7767c0900 -r 6c3a2ea4d34b emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Fri Nov 04 21:09:15 2005 +0000
+++ b/emulators/qemu/Makefile   Fri Nov 04 21:10:42 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/11/04 21:05:51 dbj Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/04 21:10:42 dbj Exp $
 #
 
 DISTNAME=              qemu-0.7.2
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            emulators
 MASTER_SITES=          http://fabrice.bellard.free.fr/qemu/
 
diff -r 14f7767c0900 -r 6c3a2ea4d34b emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Fri Nov 04 21:09:15 2005 +0000
+++ b/emulators/qemu/distinfo   Fri Nov 04 21:10:42 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/11/04 21:09:15 dbj Exp $
+$NetBSD: distinfo,v 1.14 2005/11/04 21:10:42 dbj Exp $
 
 SHA1 (qemu-0.7.2.tar.gz) = 4daeccb57448eacc444152f30b5d84dfcca89dfe
 RMD160 (qemu-0.7.2.tar.gz) = 1d2dcc8f43ff4b4b9aa045c64e38c9a10140b13e
@@ -21,3 +21,4 @@
 SHA1 (patch-av) = bd88088f41b6b3c256eec933e5f267fc432e58fa
 SHA1 (patch-aw) = 6299964fb3a747e8f5dfe4354e66722030ee9a75
 SHA1 (patch-ax) = b6eb66859e3ab318ec388d9f33201c27f34677ca
+SHA1 (patch-ay) = 2f2393dbc706b490e3faf05a243a9aa21e634af6
diff -r 14f7767c0900 -r 6c3a2ea4d34b emulators/qemu/patches/patch-ay
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/qemu/patches/patch-ay   Fri Nov 04 21:10:42 2005 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ay,v 1.1 2005/11/04 21:10:42 dbj Exp $
+
+--- target-i386/helper.c.orig  2005-09-04 13:11:31.000000000 -0400
++++ target-i386/helper.c
+@@ -3261,7 +3261,7 @@ static void imul64(uint64_t *plow, uint6
+ static int div64(uint64_t *plow, uint64_t *phigh, uint64_t b)
+ {
+     uint64_t q, r, a1, a0;
+-    int i, qb;
++    int i, qb, ab;
+ 
+     a0 = *plow;
+     a1 = *phigh;
+@@ -3275,8 +3275,9 @@ static int div64(uint64_t *plow, uint64_
+             return 1;
+         /* XXX: use a better algorithm */
+         for(i = 0; i < 64; i++) {
++            ab = a1 >> 63;
+             a1 = (a1 << 1) | (a0 >> 63);
+-            if (a1 >= b) {
++            if (ab || a1 >= b) {
+                 a1 -= b;
+                 qb = 1;
+             } else {