home *** CD-ROM | disk | FTP | other *** search
/ Computer Club Elmshorn Atari PD / CCE_PD.iso / pc / 0400 / CCE_0457.ZIP / CCE_0457 / GASSRC03.ZOO / gas-diff < prev    next >
Text File  |  1991-02-22  |  8KB  |  326 lines
  1. diff -c -r gas-1.38/app.c cross-gas-1.38/app.c
  2. *** gas-1.38/app.c    Thu Oct 11 12:26:17 1990
  3. --- cross-gas-1.38/app.c    Mon Jan 21 18:52:45 1991
  4. ***************
  5. *** 74,80 ****
  6. --- 74,86 ----
  7.   int
  8.   scrub_from_file()
  9.   {
  10. + #ifdef atarist
  11. +     int c;
  12. +     if((c = getc(scrub_file)) == '\r') c = getc(scrub_file);
  13. +     return c;
  14. + #else
  15.       return getc(scrub_file);
  16. + #endif
  17.   }
  18.   
  19.   void
  20. diff -c -r gas-1.38/as.c cross-gas-1.38/as.c
  21. *** gas-1.38/as.c    Thu Oct 11 12:26:17 1990
  22. --- cross-gas-1.38/as.c    Mon Jan 21 18:52:45 1991
  23. ***************
  24. *** 81,86 ****
  25. --- 81,89 ----
  26.           if(signal(sig[a], SIG_IGN) != SIG_IGN)
  27.               signal(sig[a], got_sig);
  28.   
  29. + #ifdef atarist
  30. +     _binmode(1);
  31. + #endif
  32.       myname=argv[0];
  33.       bzero (flagseen, sizeof(flagseen)); /* aint seen nothing yet */
  34.       out_file_name    = "a.out";    /* default .o file */
  35. diff -c -r gas-1.38/expr.c cross-gas-1.38/expr.c
  36. *** gas-1.38/expr.c    Fri Jan  4 13:13:00 1991
  37. --- cross-gas-1.38/expr.c    Tue Feb  5 18:48:54 1991
  38. ***************
  39. *** 527,535 ****
  40.          * It is faster to re-cancel them to NULL
  41.          * than to check for this special case.
  42.          */
  43. !       if (expressionP -> X_subtract_symbol == expressionP -> X_add_symbol
  44. !           || (   expressionP->X_subtract_symbol->sy_frag==expressionP->X_add_symbol->sy_frag
  45. !           && expressionP->X_subtract_symbol->sy_value==expressionP->X_add_symbol->sy_value))
  46.       {
  47.         expressionP -> X_subtract_symbol    = NULL;
  48.         expressionP -> X_add_symbol        = NULL;
  49. --- 527,533 ----
  50.          * It is faster to re-cancel them to NULL
  51.          * than to check for this special case.
  52.          */
  53. !       if (expressionP -> X_subtract_symbol == expressionP -> X_add_symbol)
  54.       {
  55.         expressionP -> X_subtract_symbol    = NULL;
  56.         expressionP -> X_add_symbol        = NULL;
  57. diff -c -r gas-1.38/input-file.c cross-gas-1.38/input-file.c
  58. *** gas-1.38/input-file.c    Fri Jan  4 13:12:57 1991
  59. --- cross-gas-1.38/input-file.c    Mon Jan 21 18:52:55 1991
  60. ***************
  61. *** 59,65 ****
  62. --- 59,100 ----
  63.   
  64.   #define BUFFER_SIZE (32 * 1024)
  65.   
  66. + #ifdef atarist
  67. + /* a little ditty here to do fread, filtering out '\r'. */
  68. + 
  69. + int filtering_fread(where, how_big, how_many, f)
  70. + char * where;
  71. + int how_big;
  72. + int how_many;
  73. + FILE * f;
  74. + {
  75. +   int i, j, c;
  76. + 
  77. +   for (i = 0 ; i < how_many ; )
  78. +     {
  79. +     for (j = 0 ; j < how_big ; )
  80. +         {
  81. +         c = fgetc(f);
  82. +         if (c == EOF)
  83. +             goto done;
  84. +         if (c != '\r')
  85. +             {
  86. +             *where++ = c;
  87. +             j++;
  88. +             }
  89. +         }
  90. +     i++;
  91. +     }
  92. + done:
  93. +   return(i);
  94. + }
  95. +  
  96. + #else
  97. +  
  98.   static char in_buf[BUFFER_SIZE];
  99. +   
  100. + #endif
  101. +  
  102.   
  103.   /*
  104.    * We use static data: the data area is not sharable.
  105. ***************
  106. *** 195,206 ****
  107.           as_perror ("Can't open %s for reading", file_name);
  108.           return;
  109.       }
  110. ! #ifndef VMS
  111.       setbuffer(f_in,in_buf,BUFFER_SIZE);
  112.   #endif /* VMS */
  113.       c=getc(f_in);
  114.       if(c=='#') {    /* Begins with comment, may not want to preprocess */
  115.           c=getc(f_in);
  116.           if(c=='N') {
  117.               fgets(buf,80,f_in);
  118.               if(!strcmp(buf,"O_APP\n"))
  119. --- 230,247 ----
  120.           as_perror ("Can't open %s for reading", file_name);
  121.           return;
  122.       }
  123. ! #if (!(defined(VMS) || defined(atarist) || defined(atariminix)))
  124.       setbuffer(f_in,in_buf,BUFFER_SIZE);
  125.   #endif /* VMS */
  126.       c=getc(f_in);
  127. + #ifdef atarist
  128. +     if(c == '\r') c = getc(f_in);
  129. + #endif
  130.       if(c=='#') {    /* Begins with comment, may not want to preprocess */
  131.           c=getc(f_in);
  132. + #ifdef atarist
  133. +         if(c == '\r') c = getc(f_in);
  134. + #endif
  135.           if(c=='N') {
  136.               fgets(buf,80,f_in);
  137.               if(!strcmp(buf,"O_APP\n"))
  138. ***************
  139. *** 274,280 ****
  140.       }
  141.       size=BUFFER_SIZE-n;
  142.     } else
  143. !     size= fread(where,sizeof(char),BUFFER_SIZE,f_in);
  144.     if (size < 0)
  145.       {
  146.         as_perror ("Can't read from %s", file_name);
  147. --- 315,325 ----
  148.       }
  149.       size=BUFFER_SIZE-n;
  150.     } else
  151. ! #ifdef atarist
  152. !   size= filtering_fread(where,sizeof(char),BUFFER_SIZE,f_in);
  153. ! #else
  154. !   size= fread(where,sizeof(char),BUFFER_SIZE,f_in);
  155. ! #endif
  156.     if (size < 0)
  157.       {
  158.         as_perror ("Can't read from %s", file_name);
  159. diff -c -r gas-1.38/input-scrub.c cross-gas-1.38/input-scrub.c
  160. *** gas-1.38/input-scrub.c    Fri Jan  4 13:12:58 1991
  161. --- cross-gas-1.38/input-scrub.c    Mon Jan 21 18:52:56 1991
  162. ***************
  163. *** 54,60 ****
  164. --- 54,64 ----
  165.   static char *    buffer_start;    /* -> 1st char of full buffer area. */
  166.   static char *    partial_where;    /* -> after last full line in buffer. */
  167.   static int    partial_size;    /* >=0. Number of chars in partial line in buffer. */
  168. + #if (defined(atarist) || defined(atariminix))
  169. + static char    save_source [2];    /* odd num fucks alignment? */
  170. + #else
  171.   static char    save_source [AFTER_SIZE];
  172. + #endif
  173.                   /* Because we need AFTER_STRING just after last */
  174.                   /* full line, it clobbers 1st part of partial */
  175.                   /* line. So we preserve 1st part of partial */
  176. diff -c -r gas-1.38/m68k-opcode.h cross-gas-1.38/m68k-opcode.h
  177. *** gas-1.38/m68k-opcode.h    Wed Aug  1 14:49:19 1990
  178. --- cross-gas-1.38/m68k-opcode.h    Mon Jan 21 18:52:58 1991
  179. ***************
  180. *** 628,633 ****
  181. --- 628,634 ----
  182.   {"trapvc",    one(0054374),        one(0177777),        ""},
  183.   {"trapvs",    one(0054774),        one(0177777),        ""},
  184.   
  185. + #if (!(CROSSATARI || atarist || atariminix))
  186.   {"trapcc.w",    one(0052372),        one(0177777),        ""},
  187.   {"trapcs.w",    one(0052772),        one(0177777),        ""},
  188.   {"trapeq.w",    one(0053772),        one(0177777),        ""},
  189. ***************
  190. *** 662,667 ****
  191. --- 663,670 ----
  192.   {"trapvc.l",    one(0054373),        one(0177777),        ""},
  193.   {"trapvs.l",    one(0054773),        one(0177777),        ""},
  194.   
  195. + #endif /* !(CROSSATARI || atarist || atariminix) */
  196. + 
  197.   {"trapv",    one(0047166),        one(0177777),        ""},
  198.   
  199.   {"tstb",    one(0045000),        one(0177700),        ";b"},
  200. ***************
  201. *** 1385,1391 ****
  202. --- 1388,1396 ----
  203.   
  204.   /* Alternate mnemonics for SUN */
  205.   
  206. + #if (!(CROSSATARI || atarist || atariminix))
  207.   {"jbsr",    one(0060400),        one(0177400),        "Bg"},
  208. + #endif
  209.   {"jbsr",    one(0047200),        one(0177700),        "!s"},
  210.   {"jra",        one(0060000),        one(0177400),        "Bg"},
  211.   {"jra",        one(0047300),        one(0177700),        "!s"},
  212. diff -c -r gas-1.38/m68k.c cross-gas-1.38/m68k.c
  213. *** gas-1.38/m68k.c    Tue Dec  4 15:50:00 1990
  214. --- cross-gas-1.38/m68k.c    Wed Feb  6 09:52:38 1991
  215. ***************
  216. *** 1258,1265 ****
  217.                       long t;
  218.   
  219.                       t=get_num(opP->con1,80);
  220. !                     if(t<1 || t>8 || isvar(opP->con1))
  221. !                         losing++;
  222.                   }
  223.                   break;
  224.   
  225. --- 1258,1271 ----
  226.                       long t;
  227.   
  228.                       t=get_num(opP->con1,80);
  229. !                     if (s[1]!='s') {
  230. !                         if(t<1 || t>8 || isvar(opP->con1))
  231. !                             losing++;
  232. !                     }
  233. !                     else {
  234. !                         if(t<0 || t>7 || isvar(opP->con1))
  235. !                             losing++;
  236. !                     }
  237.                   }
  238.                   break;
  239.   
  240. ***************
  241. *** 1474,1480 ****
  242.                   if(   !issword(nextword)
  243.                      || (   isvar(opP->con1)
  244.                          && (  (   opP->con1->e_siz==0
  245. !                           && flagseen['l']==0)
  246.                          || opP->con1->e_siz==3))) {
  247.   
  248.                       if(opP->reg==PC)
  249. --- 1480,1486 ----
  250.                   if(   !issword(nextword)
  251.                      || (   isvar(opP->con1)
  252.                          && (  (   opP->con1->e_siz==0
  253. !                           && flagseen['l']!=0)
  254.                          || opP->con1->e_siz==3))) {
  255.   
  256.                       if(opP->reg==PC)
  257. ***************
  258. *** 1489,1495 ****
  259.                               break;
  260.                           } else {
  261.                               addword(0x0170);
  262. !                             add_fix('l',opP->con1,1);
  263.                           }
  264.                       } else
  265.                           addword(0x0170);
  266. --- 1495,1501 ----
  267.                               break;
  268.                           } else {
  269.                               addword(0x0170);
  270. !                             add_fix('l',opP->con1,0);
  271.                           }
  272.                       } else
  273.                           addword(0x0170);
  274. ***************
  275. *** 1976,1984 ****
  276.               break;
  277.   
  278.           case 'Q':
  279. !             tmpreg=get_num(opP->con1,10);
  280. !             if(tmpreg==8)
  281. !                 tmpreg=0;
  282.               install_operand(s[1],tmpreg);
  283.               break;
  284.   
  285. --- 1982,1997 ----
  286.               break;
  287.   
  288.           case 'Q':
  289. !             if (s[1]!='s') {
  290. !                 tmpreg=get_num(opP->con1,10);
  291. !                   if(tmpreg==8)
  292. !                     tmpreg=0;
  293. !             }
  294. !             else {
  295. !                 tmpreg=get_num(opP->con1,20);
  296. !                   if(tmpreg==8)
  297. !                     tmpreg=0;
  298. !             }
  299.               install_operand(s[1],tmpreg);
  300.               break;
  301.   
  302. diff -c -r gas-1.38/struc-symbol.h cross-gas-1.38/struc-symbol.h
  303. *** gas-1.38/struc-symbol.h    Fri Jul  6 14:43:12 1990
  304. --- cross-gas-1.38/struc-symbol.h    Mon Jan 21 18:52:59 1991
  305. ***************
  306. *** 18,24 ****
  307.   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  308.   
  309.   #ifndef        VMS
  310. ! #include "a.out.gnu.h"        /* Needed to define struct nlist. Sigh. */
  311.   #else
  312.   #include "a_out.h"
  313.   #endif
  314. --- 18,28 ----
  315.   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  316.   
  317.   #ifndef        VMS
  318. ! #  if (atarist || atariminix || CROSSATARI)
  319. ! #    include <gnu-out.h>
  320. ! #  else
  321. ! #    include "a.out.gnu.h"        /* Needed to define struct nlist. Sigh. */
  322. ! #  endif
  323.   #else
  324.   #include "a_out.h"
  325.   #endif
  326.