The Sfilename member of struct Srcpos shouldn't be dependent on TX86.

Cleanup a bunch of repeated conditional code by moving it inside a helper function.
michelf · Jul 13, 2011 · 3d172b8 · 3d172b8
1 parent b725965
commit 3d172b8
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 70 deletions.
diff --git a/src/backend/cc.h b/src/backend/cc.h
@@ -220,17 +220,19 @@ typedef struct Srcpos
     #define srcpos_sfile(p)     (**(p).Sfilptr)
     #define srcpos_name(p)      (srcpos_sfile(p).SFname)
 #endif
+#endif
 #if MARS
     const char *Sfilename;
     #define srcpos_name(p)      ((p).SFname)
 #endif
-#endif
 #if M_UNIX
     short Sfilnum;              // file number
 #endif
 #if SOURCE_OFFSETS
     unsigned long Sfiloff;      // byte offset
 #endif
+
+    void print(const char *func);
 } Srcpos;
 
 #ifndef TOKEN_H

diff --git a/src/backend/cgen.c b/src/backend/cgen.c
@@ -463,11 +463,7 @@ code *genlinnum(code *c,Srcpos srcpos)
 {   code cs;
 
 #if 0
-#if MARS
-    printf("genlinnum(Sfilename = %p, Slinnum = %u)\n", srcpos.Sfilename, srcpos.Slinnum);
-#else
-    printf("genlinnum(Sfilptr = %p, Slinnum = %u)\n", srcpos.Sfilptr, srcpos.Slinnum);
-#endif
+    srcpos.print("genlinnum");
 #endif
     cs.Iop = ESCAPE | ESClinnum;
     cs.Iflags = 0;

diff --git a/src/backend/cgobj.c b/src/backend/cgobj.c
@@ -801,19 +801,12 @@ void objlinnum(Srcpos srcpos,targ_size_t offset)
     unsigned linnum = srcpos.Slinnum;
 
 #if 0
-#if MARS
-    printf("objlinnum(cseg=%d, filename=%s linnum=%u, offset=x%lx)\n",
-        cseg,srcpos.Sfilename ? srcpos.Sfilename : "null",linnum,offset);
-#else
-    printf("objlinnum(cseg=%d, filptr=%p linnum=%u, offset=x%lx)\n",
-        cseg,srcpos.Sfilptr ? *srcpos.Sfilptr : 0,linnum,offset);
-    if (srcpos.Sfilptr)
-    {
-        Sfile *sf = *srcpos.Sfilptr;
-        printf("filename = %s\n", sf ? sf->SFname : "null");
-    }
+#if MARS || SCPP
+    printf("objlinnum(cseg=%d, offset=0x%lx) ", cseg, offset);
 #endif
+    srcpos.print("");
 #endif
+
     char linos2 = config.exe == EX_OS2 && cseg >= 0;
 
 #if MARS

diff --git a/src/backend/el.c b/src/backend/el.c
@@ -2947,19 +2947,7 @@ void elem_print(elem *e)
   elem_debug(e);
   if (configv.addlinenumbers)
   {
-#if TX86
-#if MARS
-        dbg_printf("fil=%p lin=%u ",e->Esrcpos.Sfilename,e->Esrcpos.Slinnum);
-#elif SCPP
-        dbg_printf("fil=%p lin=%u ",e->Esrcpos.Sfilptr,e->Esrcpos.Slinnum);
-#endif
-#else
-        dbg_printf("fil=%d lin=%u ",((struct ELEMsrcpos *)e)->Esrcpos.Sfilnum,
-        ((struct ELEMsrcpos *)e)->Esrcpos.Slinnum);
-#endif
-#if SOURCE_OFFSETS
-        dbg_printf("off %d ",((struct ELEMsrcpos *)e)->Esrcpos.Sfiloff);
-#endif
+        e->Esrcpos.print("elem_print");
   }
   if (!PARSER)
   {     dbg_printf("cnt=%d ",e->Ecount);

diff --git a/src/backend/elfobj.c b/src/backend/elfobj.c
@@ -1244,38 +1244,25 @@ void obj_term()
 
 void objlinnum(Srcpos srcpos, targ_size_t offset)
 {
-    unsigned linnum = srcpos.Slinnum;
-    if (linnum == 0)
+    if (srcpos.Slinnum == 0)
         return;
 
 #if 0
-#if MARS
-    printf("objlinnum(cseg=%d, filename=%s linnum=%u, offset=x%lx)\n",
-        cseg,srcpos.Sfilename ? srcpos.Sfilename : "null",linnum,offset);
-#endif
-#if SCPP
-    printf("objlinnum(cseg=%d, filptr=%p linnum=%u, offset=x%lx)\n",
-        cseg,srcpos.Sfilptr ? *srcpos.Sfilptr : 0,linnum,offset);
-    if (srcpos.Sfilptr)
-    {
-        Sfile *sf = *srcpos.Sfilptr;
-        printf("filename = %s\n", sf ? sf->SFname : "null");
-    }
+#if MARS || SCPP
+    printf("objlinnum(cseg=%d, offset=0x%lx) ", cseg, offset);
 #endif
+    srcpos.print("");
 #endif
 
 #if MARS
     if (!srcpos.Sfilename)
         return;
 #endif
 #if SCPP
-    Sfile *sf;
-    if (srcpos.Sfilptr)
-    {   sfile_debug(&srcpos_sfile(srcpos));
-        sf = *srcpos.Sfilptr;
-    }
-    else
+    if (!srcpos.Sfilptr)
         return;
+    sfile_debug(&srcpos_sfile(srcpos));
+    Sfile *sf = *srcpos.Sfilptr;
 #endif
 
     size_t i;

diff --git a/src/backend/machobj.c b/src/backend/machobj.c
@@ -1034,38 +1034,25 @@ void obj_term()
 
 void objlinnum(Srcpos srcpos, targ_size_t offset)
 {
-    unsigned linnum = srcpos.Slinnum;
-    if (linnum == 0)
+    if (srcpos.Slinnum == 0)
         return;
 
 #if 0
-#if MARS
-    printf("objlinnum(cseg=%d, filename=%s linnum=%u, offset=x%lx)\n",
-        cseg,srcpos.Sfilename ? srcpos.Sfilename : "null",linnum,offset);
-#endif
-#if SCPP
-    printf("objlinnum(cseg=%d, filptr=%p linnum=%u, offset=x%lx)\n",
-        cseg,srcpos.Sfilptr ? *srcpos.Sfilptr : 0,linnum,offset);
-    if (srcpos.Sfilptr)
-    {
-        Sfile *sf = *srcpos.Sfilptr;
-        printf("filename = %s\n", sf ? sf->SFname : "null");
-    }
+#if MARS || SCPP
+    printf("objlinnum(cseg=%d, offset=x%lx) ", cseg, offset);
 #endif
+    srcpos.print("");
 #endif
 
 #if MARS
     if (!srcpos.Sfilename)
         return;
 #endif
 #if SCPP
-    Sfile *sf;
-    if (srcpos.Sfilptr)
-    {   sfile_debug(&srcpos_sfile(srcpos));
-        sf = *srcpos.Sfilptr;
-    }
-    else
+    if (!srcpos.Sfilptr)
         return;
+    sfile_debug(&srcpos_sfile(srcpos));
+    Sfile *sf = *srcpos.Sfilptr;
 #endif
 
     size_t i;

diff --git a/src/backend/out.c b/src/backend/out.c
@@ -1493,5 +1493,22 @@ symbol *out_readonly_sym(tym_t ty, void *p, int len)
     return s;
 }
 
+void Srcpos::print(const char *func)
+{
+    printf("%s(", func);
+#if MARS
+    printf("Sfilename = %s", Sfilename ? Sfilename : "null");
+#else
+    Sfile *sf = Sfilptr ? *Sfilptr : NULL;
+    printf("Sfilptr = %p (filename = %s)", sf, sf ? sf->SFname : "null");
+#endif
+    printf(", Slinnum = %u", Slinnum);
+#if SOURCE_OFFSETS
+    printf(", Sfiloff = %d", Sfiloff);
+#endif
+    printf(")\n");
+}
+
+
 #endif /* !SPP */