home *** CD-ROM | disk | FTP | other *** search
/ Source Code 1992 March / Source_Code_CD-ROM_Walnut_Creek_March_1992.iso / usenet / altsrcs / 1 / 1286 / gas-dbxpch.01
Text File  |  1990-12-28  |  13KB  |  482 lines
  1. *** ../gas-1.35.old/i386.c    Mon Mar  5 20:11:07 1990
  2. --- ./i386.c    Mon May  7 17:29:27 1990
  3. ***************
  4. *** 1042,1046 ****
  5.       /* I caught it failing with obstack_room == 6,
  6.          so I changed to <=   pace */
  7. !     if (obstack_room (&frags) <= 6) frag_new (0);
  8.       p = frag_more (1);
  9.       p[0] = t->base_opcode;
  10. --- 1042,1046 ----
  11.       /* I caught it failing with obstack_room == 6,
  12.          so I changed to <=   pace */
  13. !     if (obstack_room (&frags) <= 6) { frag_wane(frag_now);  frag_new (0); }
  14.       p = frag_more (1);
  15.       p[0] = t->base_opcode;
  16. *** ../gas-1.35.old/msomf.h    Mon May  7 17:26:26 1990
  17. --- ./msomf.h    Tue May  1 10:01:23 1990
  18. ***************
  19. *** 6,10 ****
  20. --- 6,13 ----
  21.   #define SDEF_CONST    3
  22.   #define SDEF_BSS    4
  23. + #define SDEF_SYMBOLS    5
  24. + #define SDEF_TYPES    6
  25.   #define SDEF_SIZE    4
  26. + #define SDEF_G_SIZE    6
  27.   
  28.   #define GDEF_DGROUP    1
  29. *** ../gas-1.35.old/write.c    Mon May  7 17:28:28 1990
  30. --- ./write.c    Tue May  1 16:45:59 1990
  31. ***************
  32. *** 48,51 ****
  33. --- 48,57 ----
  34.   #endif /* M_XENIX */
  35.   
  36. + #if __STDC__
  37. + #include <stddef.h>
  38. + #else
  39. + #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
  40. + #endif
  41. + 
  42.   void    append();
  43.   
  44. ***************
  45. *** 87,90 ****
  46. --- 93,99 ----
  47.   
  48.   static long int string_byte_count;
  49. + #ifdef M_XENIX
  50. + static long int stab_symbol_count;
  51. + #endif /* M_XENIX */
  52.   
  53.   static char *        the_object_file;
  54. ***************
  55. *** 154,157 ****
  56. --- 163,195 ----
  57.   }
  58.   
  59. + #ifdef M_XENIX
  60. + threads(type, trgt_thrd, frm_thrd)
  61. + int type;
  62. + int *trgt_thrd, *frm_thrd;
  63. + {
  64. +       switch (type)
  65. +       {
  66. +         case PRIVDATA:    *trgt_thrd = DATA_TGT_THREAD;
  67. +                 *frm_thrd = DGROUP_FRAME_THREAD;
  68. +                 break;
  69. +         case PRIVBSS:    *trgt_thrd = BSS_TGT_THREAD;
  70. +                 *frm_thrd = DGROUP_FRAME_THREAD;
  71. +                 break;
  72. +         case PRIVTEXT:    *trgt_thrd = TEXT_TGT_THREAD;
  73. +                 *frm_thrd = TEXT_FRAME_THREAD;
  74. +                 break;
  75. +         case PUBLICDATA:    *trgt_thrd = DATA_TGT_THREAD;
  76. +                 *frm_thrd = DGROUP_FRAME_THREAD;
  77. +                 break;
  78. +         case PUBLICTEXT:    *trgt_thrd = TEXT_TGT_THREAD;
  79. +                 *frm_thrd = TEXT_FRAME_THREAD;
  80. +                 break;
  81. +         default:        *trgt_thrd = CONST_TGT_THREAD;
  82. +                 *frm_thrd = DGROUP_FRAME_THREAD;
  83. +                 break;
  84. +       }
  85. + }
  86. + #endif /* M_XENIX */
  87. + 
  88.   void
  89.   write_object_file()
  90. ***************
  91. *** 377,381 ****
  92.       symbol_number = 0;
  93.   #else /* M_XENIX */
  94. !     symbol_number = 1;
  95.   #endif /* M_XENIX */
  96.   
  97. --- 415,419 ----
  98.       symbol_number = 0;
  99.   #else /* M_XENIX */
  100. !     symbol_number = 1;  stab_symbol_count = 0;
  101.   #endif /* M_XENIX */
  102.   
  103. ***************
  104. *** 409,418 ****
  105.           else
  106.               symbolP -> sy_number = 0;
  107.   #else /* M_XENIX */
  108.           symbolP -> sy_number = symbol_number ++;
  109.   #endif /* M_XENIX */
  110. - #ifndef M_XENIX
  111.   #ifndef    VMS
  112.           if (name)
  113.             {            /* Ordinary case. */
  114.           symbolP -> sy_name_offset = string_byte_count;
  115. --- 447,461 ----
  116.           else
  117.               symbolP -> sy_number = 0;
  118. +         if (symbolP->sy_nlist.n_type&N_STAB)
  119. +         stab_symbol_count++;
  120.   #else /* M_XENIX */
  121.           symbolP -> sy_number = symbol_number ++;
  122.   #endif /* M_XENIX */
  123.   #ifndef    VMS
  124. + #ifndef M_XENIX
  125.           if (name)
  126. + #else /* M_XENIX */
  127. +         if (name && symbolP->sy_nlist.n_type&N_STAB)
  128. + #endif /* M_XENIX */
  129.             {            /* Ordinary case. */
  130.           symbolP -> sy_name_offset = string_byte_count;
  131. ***************
  132. *** 421,425 ****
  133.           else            /* .Stabd case. */
  134.   #endif    /* not VMS */
  135. - #endif /* not M_XENIX */
  136.           symbolP -> sy_name_offset = 0;
  137.           symbolPP = & (symbolP -> sy_next);
  138. --- 464,467 ----
  139. ***************
  140. *** 757,761 ****
  141.     output_file_create (out_file_name);
  142.     omf_initialize_a_out(output_file_desc(), module_name, text_siz, data_siz,
  143. !                (long) local_bss_counter, 0L);
  144.   
  145.   /*  Traverse the symbol chain emitting external symbol definitions
  146. --- 799,805 ----
  147.     output_file_create (out_file_name);
  148.     omf_initialize_a_out(output_file_desc(), module_name, text_siz, data_siz,
  149. !                (long) local_bss_counter, 0L,
  150. !                flagseen['g'], stab_symbol_count * sizeof(struct nlist),
  151. !                string_byte_count);
  152.   
  153.   /*  Traverse the symbol chain emitting external symbol definitions
  154. ***************
  155. *** 783,787 ****
  156.     for (   symbolP = symbol_rootP;   symbolP;   symbolP = symbolP -> sy_next   )
  157.     {
  158. !       if (PUBLIC(symbolP->sy_type))
  159.       {
  160.           unsigned int group = 0, segment = 0;
  161. --- 827,831 ----
  162.     for (   symbolP = symbol_rootP;   symbolP;   symbolP = symbolP -> sy_next   )
  163.     {
  164. !     if (PUBLIC(symbolP->sy_type))
  165.       {
  166.           unsigned int group = 0, segment = 0;
  167. ***************
  168. *** 867,891 ****
  169.             int external = EXTDEF(symbolP->sy_type);
  170.   
  171. !           switch (symbolP->sy_type)
  172. !           {
  173. !             case PRIVDATA:    trgt_thrd = DATA_TGT_THREAD;
  174. !                     frm_thrd = DGROUP_FRAME_THREAD;
  175. !                     break;
  176. !             case PRIVBSS:    trgt_thrd = BSS_TGT_THREAD;
  177. !                     frm_thrd = DGROUP_FRAME_THREAD;
  178. !                     break;
  179. !             case PRIVTEXT:    trgt_thrd = TEXT_TGT_THREAD;
  180. !                     frm_thrd = TEXT_FRAME_THREAD;
  181. !                     break;
  182. !             case PUBLICDATA:    trgt_thrd = DATA_TGT_THREAD;
  183. !                     frm_thrd = DGROUP_FRAME_THREAD;
  184. !                     break;
  185. !             case PUBLICTEXT:    trgt_thrd = TEXT_TGT_THREAD;
  186. !                     frm_thrd = TEXT_FRAME_THREAD;
  187. !                     break;
  188. !             default:        trgt_thrd = CONST_TGT_THREAD;
  189. !                     frm_thrd = DGROUP_FRAME_THREAD;
  190. !                     break;
  191. !           }
  192.             if (fixP->fx_pcrel)
  193.               frm_thrd = TEXT_FRAME_THREAD;
  194. --- 911,915 ----
  195.             int external = EXTDEF(symbolP->sy_type);
  196.   
  197. !           threads(symbolP->sy_type, &trgt_thrd, &frm_thrd);
  198.             if (fixP->fx_pcrel)
  199.               frm_thrd = TEXT_FRAME_THREAD;
  200. ***************
  201. *** 959,983 ****
  202.             int external = EXTDEF(symbolP->sy_type);
  203.   
  204. !           switch (symbolP->sy_type)
  205. !           {
  206. !             case PRIVDATA:    trgt_thrd = DATA_TGT_THREAD;
  207. !                     frm_thrd = DGROUP_FRAME_THREAD;
  208. !                     break;
  209. !             case PRIVBSS:    trgt_thrd = BSS_TGT_THREAD;
  210. !                     frm_thrd = DGROUP_FRAME_THREAD;
  211. !                     break;
  212. !             case PRIVTEXT:    trgt_thrd = TEXT_TGT_THREAD;
  213. !                     frm_thrd = TEXT_FRAME_THREAD;
  214. !                     break;
  215. !             case PUBLICDATA:    trgt_thrd = DATA_TGT_THREAD;
  216. !                     frm_thrd = DGROUP_FRAME_THREAD;
  217. !                     break;
  218. !             case PUBLICTEXT:    trgt_thrd = TEXT_TGT_THREAD;
  219. !                     frm_thrd = TEXT_FRAME_THREAD;
  220. !                     break;
  221. !             default:        trgt_thrd = CONST_TGT_THREAD;
  222. !                     frm_thrd = DGROUP_FRAME_THREAD;
  223. !                     break;
  224. !           }
  225.             if (fixP->fx_pcrel)
  226.               frm_thrd = TEXT_FRAME_THREAD;
  227. --- 983,987 ----
  228.             int external = EXTDEF(symbolP->sy_type);
  229.   
  230. !           threads(symbolP->sy_type, &trgt_thrd, &frm_thrd);
  231.             if (fixP->fx_pcrel)
  232.               frm_thrd = TEXT_FRAME_THREAD;
  233. ***************
  234. *** 1004,1007 ****
  235. --- 1008,1140 ----
  236.         }
  237.     }
  238. + 
  239. + /*  Traverse the symbol chain emitting stabs.
  240. +  */
  241. + 
  242. + #define VAL_OFF offsetof(struct nlist, n_value)
  243. + 
  244. +   if (flagseen['g'] && stab_symbol_count)
  245. +   {   
  246. +       long count = 0, ncount = 0;
  247. +       symbolS *last_startP;
  248. +       char *temp;
  249. +       symbolS *fsymP;
  250. +       int i;
  251. +       int start_fixup = 0;
  252. + 
  253. +       omf_start_ledata(I386, SDEF_SYMBOLS, 0);
  254. +       last_startP = symbol_rootP;
  255. +       for (symbolP = symbol_rootP; symbolP; symbolP = symbolP -> sy_next)
  256. +       {
  257. +      if (symbolP->sy_nlist.n_type & N_STAB)
  258. +      {
  259. +             if ((ncount + 1) * sizeof(struct nlist) >= 1016)
  260. +             {
  261. +                omf_end_ledata();
  262. + 
  263. +                /* emit relocations */
  264. + 
  265. +                start_fixup = 0;
  266. +            for (i = 0, fsymP=last_startP; i < ncount; fsymP=fsymP->sy_next)
  267. +            {
  268. +               if (fsymP->sy_nlist.n_type & N_STAB)
  269. +           {
  270. +                      if (fsymP->sy_type & N_TYPE) /* if relocation required */
  271. +              {
  272. +                int trgt_thrd, frm_thrd;
  273. +                int external = EXTDEF(fsymP->sy_type & N_TYPE);
  274. + 
  275. +                threads(fsymP->sy_type & N_TYPE,&trgt_thrd,&frm_thrd);
  276. +                if (!start_fixup)
  277. +                {
  278. +                            omf_start_fixup(I386);
  279. +                start_fixup++;
  280. +                }
  281. +                omf_fixup(I386, 1, /* segment relative */
  282. +                   LOC_OFFSET32, i * sizeof(struct nlist) + VAL_OFF,
  283. +                   external ? 0 : 1,
  284. +                   external ? FRM_TRGT : frm_thrd,
  285. +                   external ? 0 : 1,
  286. +                   external ? TGT_EI : trgt_thrd,
  287. +                   1, /* No offset */
  288. +               0, /* No frame required */
  289. +                   external ? fsymP->sy_number : 0,
  290. +               0);
  291. +              }
  292. +              i++;
  293. +           }
  294. +            }
  295. +            if (start_fixup)
  296. +                   omf_end_fixup();
  297. + 
  298. +                /* start new segment */
  299. + 
  300. +                ncount = 0;  last_startP = symbolP;
  301. +                omf_start_ledata(I386, SDEF_SYMBOLS, count*sizeof(struct nlist));
  302. +             }
  303. +             temp = symbolP->sy_nlist.n_un.n_name;
  304. +             symbolP->sy_nlist.n_un.n_strx = symbolP->sy_name_offset;
  305. +             omf_ledata(&(symbolP->sy_nlist), sizeof(struct nlist));
  306. +             symbolP->sy_nlist.n_un.n_name = temp;
  307. +            ncount++;  count++;
  308. +      }
  309. +       }
  310. +       omf_end_ledata();
  311. +       start_fixup = 0;
  312. +       for (i = 0, fsymP = last_startP; i < ncount; fsymP = fsymP->sy_next)
  313. +       {
  314. +          if (fsymP->sy_nlist.n_type & N_STAB)
  315. +      {
  316. +             if (fsymP->sy_type & N_TYPE) /* if relocation required */
  317. +         {
  318. +           int trgt_thrd, frm_thrd;
  319. +           int external = EXTDEF(fsymP->sy_type & N_TYPE);
  320. + 
  321. +           threads(fsymP->sy_type & N_TYPE,&trgt_thrd,&frm_thrd);
  322. +           if (!start_fixup)
  323. +               {
  324. +                  omf_start_fixup(I386);
  325. +                  start_fixup++;
  326. +               }
  327. +           omf_fixup(I386, 1, /* segment relative */
  328. +              LOC_OFFSET32, i * sizeof(struct nlist) + VAL_OFF,
  329. +              external ? 0 : 1,
  330. +              external ? FRM_TRGT : frm_thrd,
  331. +              external ? 0 : 1,
  332. +              external ? TGT_EI : trgt_thrd,
  333. +              1, /* No offset */
  334. +                   0, /* No frame required */
  335. +              external ? fsymP->sy_number : 0,
  336. +           0);
  337. +         }
  338. +         i++;
  339. +      }
  340. +       }
  341. +       if (start_fixup)
  342. +          omf_end_fixup();
  343. + 
  344. +       count = sizeof(string_byte_count);  ncount = count;
  345. +       omf_start_ledata(I386, SDEF_TYPES, 0);
  346. +       omf_ledata(&string_byte_count, sizeof(string_byte_count));
  347. +       for (symbolP = symbol_rootP; symbolP; symbolP = symbolP -> sy_next)
  348. +       {
  349. +          if (symbolP->sy_nlist.n_type & N_STAB && symbolP -> sy_name)
  350. +      {
  351. +         int len = strlen(symbolP -> sy_name) + 1;
  352. + 
  353. +         if (ncount + len > 1016)
  354. +         {
  355. +            omf_end_ledata();
  356. +                omf_start_ledata(I386, SDEF_TYPES, count);
  357. +            ncount = 0;
  358. +         }
  359. +             omf_ledata(symbolP->sy_name, len);
  360. +         count += len;  ncount += len;
  361. +      }
  362. +       }
  363. +       omf_end_ledata();
  364. +   }
  365. +   
  366. + 
  367.     omf_modend(I386);
  368.     output_file_close (out_file_name);
  369. *** ../gas-1.35.old/xenixomf.c    Mon May  7 17:26:26 1990
  370. --- ./xenixomf.c    Wed May  2 11:03:47 1990
  371. ***************
  372. *** 544,548 ****
  373. --- 544,553 ----
  374.   #define L_UBSS        8
  375.   #define L_BSS        9
  376. + #define L_TYPES        10
  377. + #define L_DEBTYP    11
  378. + #define L_SYMBOLS    12
  379. + #define L_DEBSYM    13
  380.   #define L_TSIZE        9
  381. + #define L_G_TSIZE    13
  382.   
  383.   char *lnames_tab[] = {
  384. ***************
  385. *** 556,560 ****
  386.       "CONST",
  387.       "_BSS",
  388. !     "BSS"
  389.   };
  390.   
  391. --- 561,569 ----
  392.       "CONST",
  393.       "_BSS",
  394. !     "BSS",
  395. !     "$$TYPES",
  396. !     "DEBTYP",
  397. !     "$$SYMBOLS",
  398. !     "DEBSYM"
  399.   };
  400.   
  401. ***************
  402. *** 573,577 ****
  403.       {SD_DWORD|SD_PUBLIC|SD_PGRES, 0, L_UDATA, L_DATA},
  404.       {SD_DWORD|SD_PUBLIC|SD_PGRES, 0, L_CONST, L_CONST},
  405. !     {SD_DWORD|SD_PUBLIC|SD_PGRES, 0, L_UBSS, L_BSS}
  406.   };
  407.   
  408. --- 582,588 ----
  409.       {SD_DWORD|SD_PUBLIC|SD_PGRES, 0, L_UDATA, L_DATA},
  410.       {SD_DWORD|SD_PUBLIC|SD_PGRES, 0, L_CONST, L_CONST},
  411. !     {SD_DWORD|SD_PUBLIC|SD_PGRES, 0, L_UBSS, L_BSS},
  412. !     {SD_BYTE|SD_PGRES, 0, L_SYMBOLS, L_DEBSYM},
  413. !     {SD_BYTE|SD_PGRES, 0, L_TYPES, L_DEBTYP}
  414.   };
  415.   
  416. ***************
  417. *** 592,596 ****
  418.   #define NUMFIXEDCOMMENTS 4
  419.   
  420. ! static unsigned char gas_comment[] = "gas-1.34";
  421.   static unsigned char lib_comment[] = "SLIBCE";
  422.   static unsigned char model_comment[] = "3s";
  423. --- 603,607 ----
  424.   #define NUMFIXEDCOMMENTS 4
  425.   
  426. ! static unsigned char gas_comment[] = "gas-1.35c";
  427.   static unsigned char lib_comment[] = "SLIBCE";
  428.   static unsigned char model_comment[] = "3s";
  429. ***************
  430. *** 604,611 ****
  431.   };
  432.   
  433. ! void omf_initialize_a_out(fd, name, text_size, data_size, bss_size, const_size)
  434.   int fd;
  435.   unsigned char *name;
  436.   long text_size, data_size, bss_size, const_size;
  437.   {
  438.       int i;
  439. --- 615,625 ----
  440.   };
  441.   
  442. ! void omf_initialize_a_out(fd, name, text_size, data_size, bss_size, const_size,
  443. !               gdb, syms_size, str_size)
  444.   int fd;
  445.   unsigned char *name;
  446.   long text_size, data_size, bss_size, const_size;
  447. + int gdb;
  448. + long syms_size, str_size;
  449.   {
  450.       int i;
  451. ***************
  452. *** 622,626 ****
  453.   
  454.       omf_start_lnames();
  455. !     for (i = 1; i <= L_TSIZE; i++)
  456.           omf_lnames(lnames_tab[i]);
  457.       omf_end_lnames();
  458. --- 636,640 ----
  459.   
  460.       omf_start_lnames();
  461. !     for (i = 1; i <= (gdb ? L_G_TSIZE : L_TSIZE); i++)
  462.           omf_lnames(lnames_tab[i]);
  463.       omf_end_lnames();
  464. ***************
  465. *** 632,636 ****
  466.       segt[SDEF_BSS].length = bss_size;
  467.       segt[SDEF_CONST].length = const_size;
  468. !     for (i = 1; i <= SDEF_SIZE; i++)
  469.           omf_segdef(I386, segt[i].attrib, 0, 0L, segt[i].length,
  470.                  segt[i].nameindex, segt[i].classindex);
  471. --- 646,655 ----
  472.       segt[SDEF_BSS].length = bss_size;
  473.       segt[SDEF_CONST].length = const_size;
  474. !     if (gdb)
  475. !     {
  476. !         segt[SDEF_SYMBOLS].length = syms_size;
  477. !         segt[SDEF_TYPES].length = str_size;
  478. !     }
  479. !     for (i = 1; i <= (gdb ? SDEF_G_SIZE : SDEF_SIZE); i++)
  480.           omf_segdef(I386, segt[i].attrib, 0, 0L, segt[i].length,
  481.                  segt[i].nameindex, segt[i].classindex);
  482.