cvt_data: zero out import tables

[ia32rtools.git] / tools / cvt_data.c

diff --git a/tools/cvt_data.c b/tools/cvt_data.c
index 692fa10..a85cf21 100644 (file)
--- a/tools/cvt_data.c
+++ b/tools/cvt_data.c
@@ -1,6 +1,6 @@
 /*
  * ia32rtools
- * (C) notaz, 2013,2014
+ * (C) notaz, 2013-2015
  *
  * This work is licensed under the terms of 3-clause BSD license.
  * See COPYING file in the top-level directory.
@@ -239,7 +239,7 @@ static void sprint_pp_short(const struct parsed_proto *pp, char *buf,
 }
 
 static const struct parsed_proto *check_var(FILE *fhdr,
-  const char *sym, const char *varname)
+  const char *sym, const char *varname, int is_export)
 {
   const struct parsed_proto *pp, *pp_sym;
   char fp_sym[256], fp_var[256], *p;
@@ -252,6 +252,8 @@ static const struct parsed_proto *check_var(FILE *fhdr,
     return NULL;
   }
 
+  if (is_export)
+    return NULL;
   if (!pp->is_func && !pp->is_fptr)
     return NULL;
 
@@ -386,6 +388,8 @@ int main(int argc, char *argv[])
   FILE *fout, *fasm, *fhdr = NULL, *frlist;
   const struct parsed_proto *pp;
   int no_decorations = 0;
+  int in_export_table = 0;
+  int rm_labels_lines = 0;
   char comment_char = '#';
   char words[20][256];
   char word[256];
@@ -467,7 +471,7 @@ int main(int argc, char *argv[])
 
     while (my_fgets(line, sizeof(line), frlist)) {
       p = sskip(line);
-      if (*p == 0 || *p == ';')
+      if (*p == 0 || *p == ';' || *p == '#')
         continue;
 
       p = next_word(words[0], sizeof(words[0]), p);
@@ -533,6 +537,10 @@ int main(int argc, char *argv[])
           if (i != 0 && !header_mode)
             fprintf(fout, "\t\t  .skip 0x%x\n", i);
         }
+        else if (IS_START(p, "; Export Address"))
+          in_export_table = 1;
+        else if (IS_START(p, "; Export"))
+          in_export_table = 0;
         continue;
       }
 
@@ -625,6 +633,8 @@ int main(int argc, char *argv[])
         }
 
         snprintf(last_sym, sizeof(last_sym), "%s", sym);
+        if (IS_START(sym, "__IMPORT_DESCRIPTOR_"))
+          rm_labels_lines = 5;
 
         pp = proto_parse(fhdr, sym, 1);
         if (pp != NULL) {
@@ -790,6 +800,7 @@ int main(int argc, char *argv[])
           p = words[w];
           if (IS_START(p, "loc_") || IS_START(p, "__imp")
              || strchr(p, '?') || strchr(p, '@')
+             || rm_labels_lines > 0
              || bsearch(&p, rlist, rlist_cnt, sizeof(rlist[0]),
                   cmpstringp))
           {
@@ -797,7 +808,7 @@ int main(int argc, char *argv[])
             snprintf(g_comment, sizeof(g_comment), "%s", p);
           }
           else {
-            pp = check_var(fhdr, sym, p);
+            pp = check_var(fhdr, sym, p, in_export_table);
             if (pp == NULL) {
               fprintf(fout, "%s%s",
                 (no_decorations || p[0] == '_') ? "" : "_", p);
@@ -822,6 +833,9 @@ int main(int argc, char *argv[])
       }
 
 fin:
+      if (rm_labels_lines > 0)
+        rm_labels_lines--;
+
       if (g_comment[0] != 0) {
         fprintf(fout, "\t\t%c %s", comment_char, g_comment);
         g_comment[0] = 0;