* fixed GCC 4.4.0 mingw compilation:

[fw/sdcc] / src / SDCCdwarf2.c

diff --git a/src/SDCCdwarf2.c b/src/SDCCdwarf2.c
index 50c24ab35ec7a22aca0b94146d029151b2208d95..0e1d1c325a698d79d6851b9ae5b38fb96af92892 100644 (file)
--- a/src/SDCCdwarf2.c
+++ b/src/SDCCdwarf2.c
@@ -990,7 +990,7 @@ dwWriteAttr (dwattr * ap)
            break;
          case DW_AT_location:
          case DW_AT_frame_base:
-           dwWriteWord (NULL, ap->val.loclist->baseOffset, NULL);
+           dwWriteWord ("Ldebug_loc_start", ap->val.loclist->baseOffset, NULL);
            break;
          default:
            dwWriteWord (NULL, ap->val.data, NULL);
@@ -1575,7 +1575,7 @@ dwFindFileIndex (char * filename)
       if (!strncmp (includeDir, filename, strlen (includeDir))
           && strlen (filename) > strlen (includeDir))
         {
-         if (*(filename+strlen (includeDir)) == DIR_SEPARATOR_CHAR)
+         if (IS_DIR_SEPARATOR(filename[strlen (includeDir)]))
            break;
        }
     }
@@ -1641,7 +1641,7 @@ dwWriteLineNumber (dwline * lp)
       curOffset = lp->offset;
 
       dwWriteByte (NULL, DW_LNS_advance_line, NULL);
-      dwWriteULEB128 (NULL, lp->line - 1, NULL);
+      dwWriteSLEB128 (NULL, lp->line - 1, NULL);
       curLine = lp->line;
 
       dwWriteByte (NULL, DW_LNS_copy, NULL);
@@ -1713,7 +1713,7 @@ dwWriteLineNumber (dwline * lp)
          curOffset = lp->offset;
        
          dwWriteByte (NULL, DW_LNS_advance_line, NULL);
-         dwWriteULEB128 (NULL, deltaLine, NULL);
+         dwWriteSLEB128 (NULL, deltaLine, NULL);
          curLine = lp->line;
          
          dwWriteByte (NULL, DW_LNS_copy, NULL);
@@ -2272,15 +2272,46 @@ dwTagFromType (sym_link * type, dwtag * parent)
                {
                  dwtag * memtp;
                  dwloc * lp;
-                 
+
+                 if (IS_BITFIELD (field->type) && !SPEC_BLEN(field->type))
+                   {
+                     field = field->next;
+                     continue;
+                   }
+
                  memtp = dwNewTag (DW_TAG_member);
                  if (*(field->name))
                    dwAddTagAttr (memtp, dwNewAttrString (DW_AT_name,
                                                          field->name));
-                 subtp = dwTagFromType (field->type, tp);
-                 dwAddTagAttr (memtp, dwNewAttrTagRef (DW_AT_type, subtp));
-                 if (!subtp->parent)
-                   dwAddTagChild (parent, subtp);
+                 if (IS_BITFIELD (field->type))
+                   {
+                     int blen = SPEC_BLEN (field->type);
+                     int bstr = SPEC_BSTR (field->type);
+                     sym_link * type;
+                     
+                     dwAddTagAttr (memtp,
+                                   dwNewAttrConst (DW_AT_byte_size,
+                                                   (blen+7)/8));
+                     dwAddTagAttr (memtp,
+                                   dwNewAttrConst (DW_AT_bit_size, blen));
+                     dwAddTagAttr (memtp,
+                                   dwNewAttrConst (DW_AT_bit_offset,
+                                                   ((blen+7) & ~7)
+                                                   - (blen+bstr)));
+                     if (blen < 8)
+                       type = typeFromStr ("uc");
+                     else
+                       type = typeFromStr ("ui");
+                     subtp = dwTagFromType (type, tp);
+                     dwAddTagAttr (memtp, dwNewAttrTagRef (DW_AT_type, subtp));
+                   }
+                 else
+                   {
+                     subtp = dwTagFromType (field->type, tp);
+                     dwAddTagAttr (memtp, dwNewAttrTagRef (DW_AT_type, subtp));
+                     if (!subtp->parent)
+                       dwAddTagChild (parent, subtp);
+                   }
 
                  lp = dwNewLoc (DW_OP_plus_uconst, NULL, field->offset);
                  dwAddTagAttr (memtp,
@@ -2353,6 +2384,16 @@ dwTagFromType (sym_link * type, dwtag * parent)
                                                    getSize (type)));
                  dwAddTagChild (dwRootTag, tp);
                  break;
+
+               case V_FIXED16X16:
+                 tp = dwNewTag (DW_TAG_base_type);
+                 dwAddTagAttr (tp, dwNewAttrConst (DW_AT_encoding,
+                                                   DW_ATE_float));
+                 dwAddTagAttr (tp, dwNewAttrString (DW_AT_name, "fixed16x16"));
+                 dwAddTagAttr (tp, dwNewAttrConst (DW_AT_byte_size,
+                                                   getSize (type)));
+                 dwAddTagChild (dwRootTag, tp);
+                 break;
                
                case V_CHAR:
                  tp = dwNewTag (DW_TAG_base_type);
@@ -2401,28 +2442,22 @@ dwTagFromType (sym_link * type, dwtag * parent)
 
 
 /*-----------------------------------------------------------------------*/
-/* dwOpenFile - opens a temporary file for debugging information         */
+/* dwOpenFile - open the debugging file (just initialize, since all      */
+/*              DWARF data goes into the assembly output file)           */
 /*-----------------------------------------------------------------------*/
 int dwOpenFile(char *file)
 {
-  dwarf2FilePtr = tempfile();
-  if(!dwarf2FilePtr) return 0;
-  
   dwTypeTagTable = newHashTable (128);
   
   return 1;
 }
 
 /*-----------------------------------------------------------------------*/
-/* dwCloseFile - close (and deletes) the temporary file for debugging    */
-/*               information                                             */
+/* dwCloseFile - close the debugging file (do nothing, since all DWARF   */
+/*               data goes into the assembly output file)                */
 /*-----------------------------------------------------------------------*/
 int dwCloseFile(void)
 {
-  if(!dwarf2FilePtr) return 0;
-  
-  fclose(dwarf2FilePtr);
-  
   return 1;
 }
   
@@ -2516,7 +2551,7 @@ dwWriteSymbolInternal (symbol *sym)
   dwattr * funcap;
   int inregs = 0;
 
-  if (!sym->level)
+  if (!sym->level || IS_EXTERN (sym->etype))
     scopetp = dwRootTag;
   else
     {
@@ -2649,8 +2684,6 @@ int dwWriteFunction(symbol *sym, iCode *ic)
   dwtag * tp;
   value * args;
     
-  if(!dwarf2FilePtr) return 0;
-  
   dwFuncTag = tp = dwNewTag (DW_TAG_subprogram);
   
   dwAddTagAttr (dwFuncTag, dwNewAttrString (DW_AT_name, sym->name));
@@ -2706,7 +2739,7 @@ int dwWriteFunction(symbol *sym, iCode *ic)
 /*-----------------------------------------------------------------------*/
 int dwWriteEndFunction(symbol *sym, iCode *ic, int offset)
 {
-  char debugSym[SDCC_NAME_MAX];
+  char debugSym[SDCC_NAME_MAX + 1];
   
   if (ic)
     {
@@ -2744,7 +2777,7 @@ int dwWriteEndFunction(symbol *sym, iCode *ic, int offset)
 /*-----------------------------------------------------------------------*/
 int dwWriteLabel(symbol *sym, iCode *ic)
 {
-  char debugSym[SDCC_NAME_MAX];
+  char debugSym[SDCC_NAME_MAX + 1];
   dwtag * tp;
   
   /* ignore the compiler generated labels */
@@ -2843,18 +2876,15 @@ int dwWriteType(structdef *sdef, int block, int inStruct, char *tag)
 int dwWriteModule(char *name)
 {
   dwtag * tp;
-  char * s;
-  
-  if(!dwarf2FilePtr) return 0;
+  char verid[125];
   
   dwModuleName = Safe_strdup (name);
-  for (s = dwModuleName; *s; s++)
-    if (ispunct (*s) || isspace (*s))
-      *s = '_';
+  
+  sprintf(verid, "SDCC version %s #%s", SDCC_VERSION_STR, getBuildNumber());
     
   tp = dwNewTag (DW_TAG_compile_unit);
-  dwAddTagAttr (tp, dwNewAttrString (DW_AT_producer, "SDCC version "
-                                            SDCC_VERSION_STR));
+  dwAddTagAttr (tp, dwNewAttrString (DW_AT_producer, verid));
+
   dwAddTagAttr (tp, dwNewAttrConst (DW_AT_language, DW_LANG_C89));
 
   dwAddTagAttr (tp, dwNewAttrString (DW_AT_name, fullSrcFileName));
@@ -2877,8 +2907,6 @@ int dwWriteCLine(iCode *ic)
   dwline * lp;
   char * debugSym;
   
-  if(!dwarf2FilePtr) return 0;
-
   lp = Safe_alloc (sizeof (dwline));
 
   lp->line = ic->lineno;
@@ -2915,8 +2943,6 @@ dwWriteFrameAddress(char *variable, struct regs *reg, int offset)
   dwloc * lp;
   int regNum;
     
-  if(!dwarf2FilePtr) return 0;
-
   /* If there was a region open, close it */
   if (dwFrameLastLoc)
     {
@@ -2992,8 +3018,6 @@ dwWriteFrameAddress(char *variable, struct regs *reg, int offset)
 /*-----------------------------------------------------------------------*/
 int dwWriteALine(char *module, int Line)
 {
-  if(!dwarf2FilePtr) return 0;
-  
   return 1;
 }
 
@@ -3005,14 +3029,14 @@ int dwWriteALine(char *module, int Line)
 /*                      debug file                                       */
 /*-----------------------------------------------------------------------*/
 int
-dwarf2FinalizeFile(void)
+dwarf2FinalizeFile(FILE *of)
 {
   int tagAddress = 11;
   int abbrevNum = 0;
   int attr;
-  
-  if(!dwarf2FilePtr) return 1;
 
+  dwarf2FilePtr = of;
+  
   /* Write the .debug_line section */
   dwWriteLineNumbers ();