home *** CD-ROM | disk | FTP | other *** search
/ NetNews Usenet Archive 1992 #16 / NN_1992_16.iso / spool / gnu / gdb / bug / 882 < prev    next >
Encoding:
Text File  |  1992-07-23  |  3.7 KB  |  136 lines
  1. Newsgroups: gnu.gdb.bug
  2. Path: sparky!uunet!cis.ohio-state.edu!cygnus.com!grossman
  3. From: grossman@cygnus.com (Stu Grossman)
  4. Subject: patch for N_SO crash
  5. Message-ID: <9207201958.AA20928@cygnus.com>
  6. Sender: gnulists@ai.mit.edu
  7. Organization: GNUs Not Usenet
  8. Distribution: gnu
  9. Date: Mon, 20 Jul 1992 19:58:09 GMT
  10. Approved: bug-gdb@prep.ai.mit.edu
  11. Lines: 123
  12.  
  13. The following patch fixes a crash that occurs when reading symbol tables that
  14. have extra N_SO records.  This is mainly a problem on Suns when using certain
  15. C or C++ compilers.
  16.                 Stu
  17.  
  18. ===================================================================
  19. diff -c partial-stab.h-orig partial-stab.h
  20. *** partial-stab.h-orig    1992/07/04 13:58:43
  21. --- partial-stab.h    1992/07/16 20:40:36
  22. ***************
  23. *** 198,208 ****
  24.   
  25.       case N_SO: {
  26.         unsigned long valu = CUR_SYMBOL_VALUE;
  27. !       static int last_so_symnum = -10;
  28. !       static int dir_so_symnum = -10;
  29. !       int tmp;
  30.         char *p;
  31.         
  32.         /* End the current partial symtab and start a new one */
  33.   
  34.         SET_NAMESTRING();
  35. --- 198,226 ----
  36.   
  37.       case N_SO: {
  38.         unsigned long valu = CUR_SYMBOL_VALUE;
  39. !       static int prev_so_symnum = -10;
  40. !       static int first_so_symnum;
  41.         char *p;
  42.         
  43. +       past_first_source_file = 1;
  44. + 
  45. +       if (prev_so_symnum != symnum - 1)
  46. +         {            /* Here if prev stab wasn't N_SO */
  47. +           first_so_symnum = symnum;
  48. + 
  49. +           if (pst)
  50. +         {
  51. +           END_PSYMTAB (pst, psymtab_include_list, includes_used,
  52. +                    symnum * symbol_size, valu,
  53. +                    dependency_list, dependencies_used);
  54. +           pst = (struct partial_symtab *) 0;
  55. +           includes_used = 0;
  56. +           dependencies_used = 0;
  57. +         }
  58. +         }
  59. + 
  60. +       prev_so_symnum = symnum;
  61. + 
  62.         /* End the current partial symtab and start a new one */
  63.   
  64.         SET_NAMESTRING();
  65. ***************
  66. *** 209,224 ****
  67.   
  68.         valu += ANOFFSET (section_offsets, SECT_OFF_TEXT);
  69.   
  70. -       if (pst)
  71. -         {
  72. -           END_PSYMTAB (pst, psymtab_include_list, includes_used,
  73. -                symnum * symbol_size, valu,
  74. -                dependency_list, dependencies_used);
  75. -           pst = (struct partial_symtab *) 0;
  76. -           includes_used = 0;
  77. -           dependencies_used = 0;
  78. -         }
  79. - 
  80.         /* Some compilers (including gcc) emit a pair of initial N_SOs.
  81.            The first one is a directory name; the second the file name.
  82.            If pst exists, is empty, and has a filename ending in '/',
  83. --- 227,232 ----
  84. ***************
  85. *** 226,255 ****
  86.   
  87.         p = strrchr (namestring, '/');
  88.         if (p && *(p+1) == '\000')
  89. !         {
  90. !           dir_so_symnum = symnum;
  91. !           continue;        /* Simply ignore directory name SOs */
  92. !         }
  93.   
  94.         /* Some other compilers (C++ ones in particular) emit useless
  95. !          SOs for non-existant .c files. */
  96. ! 
  97. !       if (last_so_symnum == symnum - 1)
  98. !         continue;        /* Ignore repeated SOs */
  99. !       last_so_symnum = symnum;
  100. ! 
  101. !       past_first_source_file = 1;
  102.   
  103. !       if (dir_so_symnum == symnum - 1) /* Was prev. SO a directory? */
  104. !         tmp = dir_so_symnum;
  105. !       else
  106. !         tmp = symnum;
  107. !       pst = START_PSYMTAB (objfile, section_offsets,
  108. !                    namestring, valu,
  109. !                    tmp * symbol_size,
  110. !                    objfile -> global_psymbols.next,
  111. !                    objfile -> static_psymbols.next);
  112. !       dir_so_symnum = -10;
  113.         continue;
  114.       }
  115.   
  116. --- 234,251 ----
  117.   
  118.         p = strrchr (namestring, '/');
  119.         if (p && *(p+1) == '\000')
  120. !         continue;        /* Simply ignore directory name SOs */
  121.   
  122.         /* Some other compilers (C++ ones in particular) emit useless
  123. !          SOs for non-existant .c files.  We ignore all subsequent SOs that
  124. !          immediately follow the first.  */
  125.   
  126. !       if (!pst)
  127. !         pst = START_PSYMTAB (objfile, section_offsets,
  128. !                  namestring, valu,
  129. !                  first_so_symnum * symbol_size,
  130. !                  objfile -> global_psymbols.next,
  131. !                  objfile -> static_psymbols.next);
  132.         continue;
  133.       }
  134.   
  135.  
  136.