Date: Tue, 17 Jun 2003 15:19:44 +0300 (EET DST)
From: Esa A E Peuha <peuha AT cc DOT helsinki DOT fi>
Sender: peuha AT sirppi DOT helsinki DOT fi
To: djgpp-workers AT delorie DOT com
Subject: Bugs in unassmbl.c
Message-ID: <Pine.OSF.4.51.0306171447140.29318@sirppi.helsinki.fi>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Reply-To: djgpp-workers AT delorie DOT com

There are two bugs in unassmbl.c (both edebug and fsdb versions): arpl
has wrong second operand, and frstor is in wrong place.  Are these OK to
commit?

Index: src/debug/edebug/unassmbl.c
===================================================================
RCS file: /cvs/djgpp/djgpp/src/debug/edebug/unassmbl.c,v
retrieving revision 1.5
diff -u -r1.5 unassmbl.c
--- src/debug/edebug/unassmbl.c	1 Jun 2002 09:27:41 -0000	1.5
+++ src/debug/edebug/unassmbl.c	17 Jun 2003 11:49:20 -0000
@@ -107,7 +107,7 @@
   "pop %eax", "pop %ecx", "pop %edx", "pop %ebx",
   "pop %esp", "pop %ebp", "pop %esi", "pop %edi",
 /* 6 */
-  "pusha", "popa", "bound %Gv,%Ma", "arpl %Ew,%Rw",
+  "pusha", "popa", "bound %Gv,%Ma", "arpl %Ew,%Gw",
   "%pf", "%pg", "%so", "%sa",
   "push %I-vv", "imul %Gv=%Ev*%I-vv", "push %I-vb", "imul %Gv=%Ev*%I-vb",
   "insb %Yb,dx", "ins%ew %Yv,dx", "outsb dx,%Xb", "outs%ew dx,%Xv",
@@ -281,11 +281,11 @@
 /*16*/ "fiadd", "fimul", "ficomw", "ficompw",
        "fisub", "fisubr", "fidiv", "fidivr",
 /*24*/ "fild", 0, "fist", "fistp",
-       "frstor", "fldt", 0, "fstpt",
+       0, "fldt", 0, "fstpt",
 /*32*/ "faddq", "fmulq", "fcomq", "fcompq",
        "fsubq", "fsubrq", "fdivq", "fdivrq",
 /*40*/ "fldq", 0, "fstq", "fstpq",
-       0, 0, "fsave", "fstsww",
+       "frstor", 0, "fsave", "fstsww",
 /*48*/ "fiaddw", "fimulw", "ficomw", "ficompw",
        "fisubw", "fisubrw", "fidivw", "fidivr",
 /*56*/ "fildw", 0, "fistw", "fistpw",
Index: src/debug/fsdb/unassmbl.c
===================================================================
RCS file: /cvs/djgpp/djgpp/src/debug/fsdb/unassmbl.c,v
retrieving revision 1.6
diff -u -r1.6 unassmbl.c
--- src/debug/fsdb/unassmbl.c	1 Jun 2002 09:27:41 -0000	1.6
+++ src/debug/fsdb/unassmbl.c	17 Jun 2003 11:49:20 -0000
@@ -116,7 +116,7 @@
   "pop %eax", "pop %ecx", "pop %edx", "pop %ebx",
   "pop %esp", "pop %ebp", "pop %esi", "pop %edi",
 /* 6 */
-  "pusha", "popa", "bound %Gv,%Ma", "arpl %Ew,%Rw",
+  "pusha", "popa", "bound %Gv,%Ma", "arpl %Ew,%Gw",
   "%pf", "%pg", "%so", "%sa",
   "push %I-vv", "imul %Gv=%Ev*%I-vv", "push %I-vb", "imul %Gv=%Ev*%I-vb",
   "insb %Yb,dx", "ins%ew %Yv,dx", "outsb dx,%Xb", "outs%ew dx,%Xv",
@@ -290,11 +290,11 @@
 /*16*/ "fiadd", "fimul", "ficomw", "ficompw",
        "fisub", "fisubr", "fidiv", "fidivr",
 /*24*/ "fild", 0, "fist", "fistp",
-       "frstor", "fldt", 0, "fstpt",
+       0, "fldt", 0, "fstpt",
 /*32*/ "faddq", "fmulq", "fcomq", "fcompq",
        "fsubq", "fsubrq", "fdivq", "fdivrq",
 /*40*/ "fldq", 0, "fstq", "fstpq",
-       0, 0, "fsave", "fstsww",
+       "frstor", 0, "fsave", "fstsww",
 /*48*/ "fiaddw", "fimulw", "ficomw", "ficompw",
        "fisubw", "fisubrw", "fidivw", "fidivr",
 /*56*/ "fildw", 0, "fistw", "fistpw",
Index: src/libemu/src/emu387.cc
===================================================================
RCS file: /cvs/djgpp/djgpp/src/libemu/src/emu387.cc,v
retrieving revision 1.13
diff -u -r1.13 emu387.cc
--- src/libemu/src/emu387.cc	26 May 2003 16:43:14 -0000	1.13
+++ src/libemu/src/emu387.cc	17 Jun 2003 11:49:22 -0000
@@ -3835,11 +3835,11 @@
 /*16*/ "fiadd", "fimul", "ficomw", "ficompw",
        "fisub", "fisubr", "fidiv", "fidivr",
 /*24*/ "fild", 0, "fist", "fistp",
-       "frstor", "fldt", 0, "fstpt",
+       0, "fldt", 0, "fstpt",
 /*32*/ "faddq", "fmulq", "fcomq", "fcompq",
        "fsubq", "fsubrq", "fdivq", "fdivrq",
 /*40*/ "fldq", 0, "fstq", "fstpq",
-       0, 0, "fsave", "fstsww",
+       "frstor", 0, "fsave", "fstsww",
 /*48*/ "fiaddw", "fimulw", "ficomw", "ficompw",
        "fisubw", "fisubrw", "fidivw", "fidivr",
 /*56*/ "fildw", 0, "fistw", "fistpw",


-- 
Esa Peuha
student of mathematics at the University of Helsinki
http://www.helsinki.fi/~peuha/