This commit was manufactured by cvs2git to create branch 'unlabeled-1.47.2'.

Sprout from master 2002-09-18 00:21:49 UTC Jakub Bogusz <qboosh@pld-linux.org> '- added rdf2ihx utility, release 2'
Delete:
    nasm-3DNow.patch
    nasm-boguself2.patch
    nasm-cpp_macros.patch
    nasm-disasm0x81.patch
    nasm-info.patch

diff --git a/nasm-3DNow.patch b/nasm-3DNow.patch
deleted file mode 100644 (file)
index 8c09317..0000000
--- a/nasm-3DNow.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- nasm-0.98.orig/insns.dat   Fri Jun  4 04:24:37 1999
-+++ nasm-0.98/insns.dat        Tue Jun 27 23:34:59 2000
-@@ -1289,3 +1289,17 @@
- PSADBW                mmxreg,mem              \301\2\x0F\xF6\110              KATMAI,MMX,SM
- PSHUFW          mmxreg,mmxreg,imm     \2\x0F\x70\110\22               KATMAI,MMX,SB,AR2
- PSHUFW          mmxreg,mem,imm                \301\2\x0F\x70\110\22           KATMAI,MMX,SM2,SB,AR2
-+PI2FD     mmxreg,mem          \301\2\x0F\x0F\110\01\x0D     PENT,3DNOW,SM
-+PI2FD     mmxreg,mmxreg       \2\x0F\x0F\110\01\x0D         PENT,3DNOW
-+PFNACC    mmxreg,mem          \301\2\x0F\x0F\110\01\x8A     PENT,3DNOW,SM
-+PFNACC    mmxreg,mmxreg       \2\x0F\x0F\110\01\x8A         PENT,3DNOW
-+PFPNACC   mmxreg,mem          \301\2\x0F\x0F\110\01\x8E     PENT,3DNOW,SM
-+PFPNACC   mmxreg,mmxreg       \2\x0F\x0F\110\01\x8E         PENT,3DNOW
-+PI2FW     mmxreg,mem          \301\2\x0F\x0F\110\01\x0C     PENT,3DNOW,SM
-+PI2FW     mmxreg,mmxreg       \2\x0F\x0F\110\01\x0C         PENT,3DNOW
-+PF2IW     mmxreg,mem          \301\2\x0F\x0F\110\01\x1C     PENT,3DNOW,SM
-+PF2IW     mmxreg,mmxreg       \2\x0F\x0F\110\01\x1C         PENT,3DNOW
-+PSWAPD    mmxreg,mem          \301\2\x0F\x0F\110\01\xBB     PENT,3DNOW,SM
-+PSWAPD    mmxreg,mmxreg       \2\x0F\x0F\110\01\xBB         PENT,3DNOW,SM
-+FFREEP    fpureg              \1\xDF\10\xC0                 PENT,3DNOW,FPU
-+

diff --git a/nasm-boguself2.patch b/nasm-boguself2.patch
deleted file mode 100644 (file)
index 685ba6b..0000000
--- a/nasm-boguself2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- nasm-0.98.32/output/outelf.c       Fri May 17 06:51:10 2002
-+++ nasm-0.98.32/output/outelf.c.org   Tue May 21 11:32:55 2002
-@@ -568,7 +568,7 @@
-       r->symbol = 0;
-       for (i=0; i<nsects; i++)
-           if (segment == sects[i]->index)
--              r->symbol = i+3;
-+              r->symbol = i+2;
-       if (!r->symbol)
-           r->symbol = GLOBAL_TEMP_BASE + raa_read(bsym, segment);
-     }
-@@ -975,13 +975,13 @@
-      * Now some standard symbols defining the segments, for relocation
-      * purposes.
-      */
--    for (i = 1; i <= nsects+1; i++) {
-+    for (i = 1; i <= nsects; i++) {
-       p = entry;
-       WRITELONG (p, 0);              /* no symbol name */
-       WRITELONG (p, 0);              /* offset zero */
-       WRITELONG (p, 0);              /* size zero */
-       WRITESHORT (p, 3);             /* local section-type thing */
--      WRITESHORT (p, (i==1 ? SHN_ABS : i-1));   /* the section id */
-+      WRITESHORT (p, i);
-       saa_wbytes (s, entry, 16L);
-       *len += 16;
-       (*local)++;
-@@ -1039,7 +1039,7 @@
-       long sym = r->symbol;
- 
-       if (sym >= GLOBAL_TEMP_BASE)
--          sym += -GLOBAL_TEMP_BASE + (nsects+3) + nlocals;
-+          sym += -GLOBAL_TEMP_BASE + (nsects+2) + nlocals;
- 
-       p = entry;
-       WRITELONG (p, r->address);

diff --git a/nasm-cpp_macros.patch b/nasm-cpp_macros.patch
deleted file mode 100644 (file)
index c80d441..0000000
--- a/nasm-cpp_macros.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- nasm-0.98.32/nasm.c        Wed May 15 01:54:46 2002
-+++ nasm-0.98.32/nasm.c.org    Tue May 21 11:53:35 2002
-@@ -427,13 +427,14 @@
-           using_debug_info = TRUE;
-           break;
-         case 'h':
--          printf("usage: nasm [-@ response file] [-o outfile] [-f format] "
-+          {const char *help_text =
-+               "usage: nasm [-@ response file] [-o outfile] [-f format] "
-                  "[-l listfile]\n"
-                  "            [options...] [--] filename\n"
-                  "    or nasm -r   for version info (obsolete)\n"
-                  "    or nasm -v   for version info (preferred)\n\n"
-                  "    -t          Assemble in SciTech TASM compatible mode\n"
--                 "    -g          Generate debug information in selected format.\n");
-+                 "    -g          Generate debug information in selected format.\n";
-           printf("    -e          preprocess only (writes output to stdout by default)\n"
-                  "    -a          don't preprocess (assemble only)\n"
-                  "    -M          generate Makefile dependencies on stdout\n\n"
-@@ -446,7 +447,8 @@
-                  "    -D<macro>[=<value>] pre-defines a macro\n"
-                  "    -U<macro>   undefines a macro\n"
-                  "    -w+foo      enables warnings about foo; -w-foo disables them\n"
--                 "where foo can be:\n");
-+                  "where foo can be:\n");
-+                             printf(help_text);}
-           for (i=1; i<=ERR_WARN_MAX; i++)
-               printf("    %-23s %s (default %s)\n",
-                      suppressed_names[i], suppressed_what[i],

diff --git a/nasm-disasm0x81.patch b/nasm-disasm0x81.patch
deleted file mode 100644 (file)
index 87ea059..0000000
--- a/nasm-disasm0x81.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -Nur nasm-0.98.08.orig/disasm.c nasm-0.98.08/disasm.c
---- nasm-0.98.08.orig/disasm.c Mon Mar  5 13:05:23 2001
-+++ nasm-0.98.08/disasm.c      Sat Jan 19 00:01:57 2002
-@@ -377,13 +377,27 @@
-           ins->oprs[c-070].offset |= (((long) *data++) << 24);
-           ins->oprs[c-070].segment |= SEG_32BIT | SEG_RELATIVE;
-       }
--      if (c >= 0100 && c <= 0177) {
-+      if (c >= 0100 && c <= 0127) {
-           int modrm = *data++;
-           ins->oprs[c & 07].basereg = (modrm >> 3) & 07;
-           ins->oprs[c & 07].segment |= SEG_RMREG;
-           data = do_ea (data, modrm, asize, segsize,
-                         &ins->oprs[(c >> 3) & 07]);
-       }
-+      if (c >= 0130 && c <= 0132) {
-+          ins->oprs[c-0130].offset = *data++;
-+          ins->oprs[c-0130].offset |= (*data++ << 8);
-+      }
-+      if (c >= 0133 && c <= 0137)
-+          continue;
-+      if (c >= 0140 && c <= 0142) {
-+          ins->oprs[c-0140].offset = *data++;
-+          ins->oprs[c-0140].offset |= (*data++ << 8);
-+          ins->oprs[c-0140].offset |= (((long) *data++) << 16);
-+          ins->oprs[c-0140].offset |= (((long) *data++) << 24);
-+      }
-+      if (c >= 0143 && c <= 0147)
-+          continue;
-       if (c >= 0200 && c <= 0277) {
-           int modrm = *data++;
-           if (((modrm >> 3) & 07) != (c & 07))
-diff -Nur nasm-0.98.08.orig/insns.dat nasm-0.98.08/insns.dat
---- nasm-0.98.08.orig/insns.dat        Mon Mar  5 13:06:10 2001
-+++ nasm-0.98.08/insns.dat     Fri Jan 18 23:05:53 2002
-@@ -40,11 +40,11 @@
- ADC       reg_eax,sbyte       \321\1\x83\202\15                  386,ND
- ADC       reg_eax,imm         \321\1\x15\41                 386,SM
- ADC       rm8,imm             \300\1\x80\202\21             8086,SM
--ADC       rm16,imm            \320\300\134\1\x81\202\131         8086,SM,ND
--ADC       rm32,imm            \321\300\144\1\x81\202\141         386,SM,ND
-+ADC       rm16,imm            \320\300\134\1\x81\202\131         8086,SM
-+ADC       rm32,imm            \321\300\144\1\x81\202\141         386,SM
- ADC       mem,imm8            \300\1\x80\202\21             8086,SM
--ADC       mem,imm16           \320\300\134\1\x81\202\131         8086,SM,ND
--ADC       mem,imm32           \321\300\144\1\x81\202\141         386,SM,ND
-+ADC       mem,imm16           \320\300\134\1\x81\202\131         8086,SM
-+ADC       mem,imm32           \321\300\144\1\x81\202\141         386,SM
- ADD       mem,reg8            \300\17\101                   8086,SM
- ADD       reg8,reg8           \300\17\101                   8086
- ADD       mem,reg16           \320\300\1\x01\101            8086,SM
-@@ -64,11 +64,11 @@
- ADD       reg_eax,sbyte       \321\1\x83\200\15                  386,ND
- ADD       reg_eax,imm         \321\1\x05\41                 386,SM
- ADD       rm8,imm             \300\1\x80\200\21             8086,SM
--ADD       rm16,imm            \320\300\134\1\x81\200\131         8086,SM,ND
--ADD       rm32,imm            \321\300\144\1\x81\200\141         386,SM,ND
-+ADD       rm16,imm            \320\300\134\1\x81\200\131         8086,SM
-+ADD       rm32,imm            \321\300\144\1\x81\200\141         386,SM
- ADD       mem,imm8            \300\1\x80\200\21             8086,SM
--ADD       mem,imm16           \320\300\134\1\x81\200\131         8086,SM,ND
--ADD       mem,imm32           \321\300\144\1\x81\200\141         386,SM,ND
-+ADD       mem,imm16           \320\300\134\1\x81\200\131         8086,SM
-+ADD       mem,imm32           \321\300\144\1\x81\200\141         386,SM
- AND       mem,reg8            \300\1\x20\101                8086,SM
- AND       reg8,reg8           \300\1\x20\101                8086
- AND       mem,reg16           \320\300\1\x21\101            8086,SM
-@@ -88,11 +88,11 @@
- AND       reg_eax,sbyte       \321\1\x83\204\15                  386,ND
- AND       reg_eax,imm         \321\1\x25\41                 386,SM
- AND       rm8,imm             \300\1\x80\204\21             8086,SM
--AND       rm16,imm            \320\300\134\1\x81\204\131         8086,SM,ND
--AND       rm32,imm            \321\300\144\1\x81\204\141         386,SM,ND
-+AND       rm16,imm            \320\300\134\1\x81\204\131         8086,SM
-+AND       rm32,imm            \321\300\144\1\x81\204\141         386,SM
- AND       mem,imm8            \300\1\x80\204\21             8086,SM
--AND       mem,imm16           \320\300\134\1\x81\204\131         8086,SM,ND
--AND       mem,imm32           \321\300\144\1\x81\204\141         386,SM,ND
-+AND       mem,imm16           \320\300\134\1\x81\204\131         8086,SM
-+AND       mem,imm32           \321\300\144\1\x81\204\141         386,SM
- ARPL      mem,reg16           \300\1\x63\101                286,PROT,SM
- ARPL      reg16,reg16         \300\1\x63\101                286,PROT
- BOUND     reg16,mem           \320\301\1\x62\110            186
-@@ -181,11 +181,11 @@
- CMP       reg_eax,sbyte       \321\1\x83\207\15                  386,ND
- CMP       reg_eax,imm         \321\1\x3D\41                 386,SM
- CMP       rm8,imm             \300\1\x80\207\21             8086,SM
--CMP       rm16,imm            \320\300\134\1\x81\207\131         8086,SM,ND
--CMP       rm32,imm            \321\300\144\1\x81\207\141         386,SM,ND
-+CMP       rm16,imm            \320\300\134\1\x81\207\131         8086,SM
-+CMP       rm32,imm            \321\300\144\1\x81\207\141         386,SM
- CMP       mem,imm8            \300\1\x80\207\21             8086,SM
--CMP       mem,imm16           \320\300\134\1\x81\207\131         8086,SM,ND
--CMP       mem,imm32           \321\300\144\1\x81\207\141         386,SM,ND
-+CMP       mem,imm16           \320\300\134\1\x81\207\131         8086,SM
-+CMP       mem,imm32           \321\300\144\1\x81\207\141         386,SM
- CMPSB     void                \332\1\xA6                    8086
- CMPSD     void                \332\321\1\xA7                386
- CMPSW     void                \332\320\1\xA7                8086
-@@ -640,11 +640,11 @@
- OR        reg_eax,sbyte       \321\1\x83\201\15                  386,ND
- OR        reg_eax,imm         \321\1\x0D\41                 386,SM
- OR        rm8,imm             \300\1\x80\201\21             8086,SM
--OR        rm16,imm            \320\300\134\1\x81\201\131         8086,SM,ND
--OR        rm32,imm            \321\300\144\1\x81\201\141         386,SM,ND
-+OR        rm16,imm            \320\300\134\1\x81\201\131         8086,SM
-+OR        rm32,imm            \321\300\144\1\x81\201\141         386,SM
- OR        mem,imm8            \300\1\x80\201\21             8086,SM
--OR        mem,imm16           \320\300\134\1\x81\201\131         8086,SM,ND
--OR        mem,imm32           \321\300\144\1\x81\201\141         386,SM,ND
-+OR        mem,imm16           \320\300\134\1\x81\201\131         8086,SM
-+OR        mem,imm32           \321\300\144\1\x81\201\141         386,SM
- OUT       imm,reg_al          \1\xE6\24                     8086,SB
- OUT       imm,reg_ax          \320\1\xE7\24                 8086,SB
- OUT       imm,reg_eax         \321\1\xE7\24                 386,SB
-@@ -931,11 +931,11 @@
- SBB       reg_eax,sbyte       \321\1\x83\203\15                  386,ND
- SBB       reg_eax,imm         \321\1\x1D\41                 386,SM
- SBB       rm8,imm             \300\1\x80\203\21             8086,SM
--SBB       rm16,imm            \320\300\134\1\x81\203\131         8086,SM,ND
--SBB       rm32,imm            \321\300\144\1\x81\203\141         386,SM,ND
-+SBB       rm16,imm            \320\300\134\1\x81\203\131         8086,SM
-+SBB       rm32,imm            \321\300\144\1\x81\203\141         386,SM
- SBB       mem,imm8            \300\1\x80\203\21             8086,SM
--SBB       mem,imm16           \320\300\134\1\x81\203\131         8086,SM,ND
--SBB       mem,imm32           \321\300\144\1\x81\203\141         386,SM,ND
-+SBB       mem,imm16           \320\300\134\1\x81\203\131         8086,SM
-+SBB       mem,imm32           \321\300\144\1\x81\203\141         386,SM
- SCASB     void                \332\1\xAE                    8086
- SCASD     void                \332\321\1\xAF                386
- SCASW     void                \332\320\1\xAF                8086
-@@ -1013,11 +1013,11 @@
- SUB       reg_eax,sbyte       \321\1\x83\205\15                  386,ND
- SUB       reg_eax,imm         \321\1\x2D\41                 386,SM
- SUB       rm8,imm             \300\1\x80\205\21             8086,SM
--SUB       rm16,imm            \320\300\134\1\x81\205\131         8086,SM,ND
--SUB       rm32,imm            \321\300\144\1\x81\205\141         386,SM,ND
-+SUB       rm16,imm            \320\300\134\1\x81\205\131         8086,SM
-+SUB       rm32,imm            \321\300\144\1\x81\205\141         386,SM
- SUB       mem,imm8            \300\1\x80\205\21             8086,SM
--SUB       mem,imm16           \320\300\134\1\x81\205\131         8086,SM,ND
--SUB       mem,imm32           \321\300\144\1\x81\205\141         386,SM,ND
-+SUB       mem,imm16           \320\300\134\1\x81\205\131         8086,SM
-+SUB       mem,imm32           \321\300\144\1\x81\205\141         386,SM
- SVDC    mem80,reg_sreg      \300\2\x0F\x78\101            486,CYRIX,SMM
- SVLDT     mem80               \300\2\x0F\x7A\200            486,CYRIX,SMM
- SVTS      mem80               \300\2\x0F\x7C\200            486,CYRIX,SMM
-@@ -1115,11 +1115,11 @@
- XOR       reg_eax,sbyte       \321\1\x83\206\15                  386,ND
- XOR       reg_eax,imm         \321\1\x35\41                 386,SM
- XOR       rm8,imm             \300\1\x80\206\21             8086,SM
--XOR       rm16,imm            \320\300\134\1\x81\206\131         8086,SM,ND
--XOR       rm32,imm            \321\300\144\1\x81\206\141         386,SM,ND
-+XOR       rm16,imm            \320\300\134\1\x81\206\131         8086,SM
-+XOR       rm32,imm            \321\300\144\1\x81\206\141         386,SM
- XOR       mem,imm8            \300\1\x80\206\21             8086,SM
--XOR       mem,imm16           \320\300\134\1\x81\206\131         8086,SM,ND
--XOR       mem,imm32           \321\300\144\1\x81\206\141         386,SM,ND
-+XOR       mem,imm16           \320\300\134\1\x81\206\131         8086,SM
-+XOR       mem,imm32           \321\300\144\1\x81\206\141         386,SM
- CMOVcc    reg16,mem           \320\301\1\x0F\330\x40\110    P6,SM
- CMOVcc    reg16,reg16         \320\301\1\x0F\330\x40\110    P6
- CMOVcc    reg32,mem           \321\301\1\x0F\330\x40\110    P6,SM

diff --git a/nasm-info.patch b/nasm-info.patch
deleted file mode 100644 (file)
index 6606854..0000000
--- a/nasm-info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- nasm-0.98.32/doc/nasmdoc.src.orig  Fri May 17 17:54:24 2002
-+++ nasm-0.98.32/doc/nasmdoc.src       Tue May 21 21:32:06 2002
-@@ -2,7 +2,7 @@
- \#
- \# Source code to NASM documentation
- \#
--\M{category}{Programming}
-+\M{category}{Programming tools:}
- \M{title}{NASM - The Netwide Assembler}
- \M{year}{2002}
- \M{author}{The NASM Development Team}
---- nasm-0.98.32/doc/rdsrc.pl.orig     Thu May 16 20:15:31 2002
-+++ nasm-0.98.32/doc/rdsrc.pl  Tue May 21 21:37:07 2002
-@@ -884,7 +884,7 @@
-   print "\@setfilename ",$metadata{'infofile'},".info\n";
-   print "\@dircategory ",$metadata{'category'},"\n";
-   print "\@direntry\n";
--  printf "* %-28s %s.\n",
-+  printf "* %-37s %s\n",
-   sprintf('%s: (%s).', $metadata{'infoname'}, $metadata{'infofile'}),
-   $metadata{'infotitle'};
-   print "\@end direntry\n";