Merge pull request #5300 from WalterBright/dwarfehbugs

Dwarf EH: complete the table generation
dlang · Dec 7, 2015 · 4afb98f · 4afb98f
2 parents 539d87c + 81846ea
commit 4afb98f
Show file tree

Hide file tree

Showing 9 changed files with 198 additions and 126 deletions.
diff --git a/src/backend/cgcod.c b/src/backend/cgcod.c
@@ -28,6 +28,7 @@
 #include        "type.h"
 #include        "exh.h"
 #include        "xmm.h"
+#include        "dwarf.h"
 
 static char __file__[] = __FILE__;      /* for tassert.h                */
 #include        "tassert.h"
@@ -527,10 +528,17 @@ void codgen()
         // Do this before code is emitted because we patch some instructions
         nteh_gentables();
     }
-    if (usednteh & EHtry)
+    if (usednteh & EHtry &&             // saw BCtry or BC_try (test EHcleanup too?)
+        config.ehmethod == EH_DM)
     {
         except_gentables();
     }
+    if (config.ehmethod == EH_DWARF)
+    {
+        funcsym_p->Sfunc->Fstartblock = startblock;
+        dwarf_except_gentables(funcsym_p, startoffset, retoffset);
+        funcsym_p->Sfunc->Fstartblock = NULL;
+    }
 #endif
 
 #if SCPP

diff --git a/src/backend/cod3.c b/src/backend/cod3.c
@@ -2997,7 +2997,8 @@ code* prolog_frame(unsigned farfunc, unsigned* xlocalsize, bool* enter)
                                     // by nteh_prolog()
         }
 #endif
-        if (config.fulltypes == CVDWARF_C || config.fulltypes == CVDWARF_D)
+        if (config.fulltypes == CVDWARF_C || config.fulltypes == CVDWARF_D ||
+            config.ehmethod == EH_DWARF)
         {   int off = 2 * REGSIZE;
             dwarf_CFA_set_loc(1);           // address after PUSH EBP
             dwarf_CFA_set_reg_offset(SP, off); // CFA is now 8[ESP]
@@ -3169,7 +3170,8 @@ code* prolog_saveregs(code *c, regm_t topush)
                 }
                 if (I64)
                     code_orrex(c, REX_W);
-                if (config.fulltypes == CVDWARF_C || config.fulltypes == CVDWARF_D)
+                if (config.fulltypes == CVDWARF_C || config.fulltypes == CVDWARF_D ||
+                    config.ehmethod == EH_DWARF)
                 {   // Emit debug_frame data giving location of saved register
                     pinholeopt(c, NULL);
                     dwarf_CFA_set_loc(calcblksize(c));  // address after save
@@ -3199,7 +3201,8 @@ code* prolog_saveregs(code *c, regm_t topush)
                 c = genpush(c, reg);
                 EBPtoESP += REGSIZE;
                 spoff += REGSIZE;
-                if (config.fulltypes == CVDWARF_C || config.fulltypes == CVDWARF_D)
+                if (config.fulltypes == CVDWARF_C || config.fulltypes == CVDWARF_D ||
+                    config.ehmethod == EH_DWARF)
                 {   // Emit debug_frame data giving location of saved register
                     // relative to 0[EBP]
                     pinholeopt(c, NULL);

diff --git a/src/backend/code.h b/src/backend/code.h
@@ -164,8 +164,8 @@ extern unsigned usednteh;
 #define NTEHcleanup     8       // destructors need to be called
 #define NTEHtry         0x10    // had C++ try statement
 #define NTEHcpp         (NTEHexcspec | NTEHcleanup | NTEHtry)
-#define EHcleanup       0x20
-#define EHtry           0x40
+#define EHcleanup       0x20    // has destructors in the 'code' instructions
+#define EHtry           0x40    // has BCtry or BC_try blocks
 #define NTEHjmonitor    0x80    // uses Mars monitor
 #define NTEHpassthru    0x100