* parser.h (do_parse): Add dbgfmt parameter.

* gas-parser.c, nasm-parser.c: Likewise.
* yasm.c (main): Pass current dbgfmt to do_parse.

svn path=/trunk/yasm/; revision=1342

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index ed93c767229aef711168c4ae4b65c1fd3ef0bb90..b212910a741c124857d2841cce8d166b01e54d58 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -615,8 +615,9 @@ main(int argc, char *argv[])
     }
 
     /* Parse! */
-    cur_parser_module->do_parse(object, cur_preproc, cur_arch, cur_objfmt, in,
-                               in_filename, list_filename != NULL, def_sect);
+    cur_parser_module->do_parse(object, cur_preproc, cur_arch, cur_objfmt,
+                               cur_dbgfmt, in, in_filename,
+                               list_filename != NULL, def_sect);
 
     /* Close input file */
     if (in != stdin)

diff --git a/libyasm/parser.h b/libyasm/parser.h
index 1a94bbb5fdde8dfdbe5cf5e1baf3913266e5232d..31ba0707423480573ae4eb61a704cce182fa6c51 100644 (file)
--- a/libyasm/parser.h
+++ b/libyasm/parser.h
@@ -68,8 +68,9 @@ typedef struct yasm_parser_module {
      *       yasm__error(); see errwarn.h for details.
      */
     void (*do_parse) (yasm_object *object, yasm_preproc *pp, yasm_arch *a,
-                     yasm_objfmt *of, FILE *f, const char *in_filename,
-                     int save_input, yasm_section *def_sect);
+                     yasm_objfmt *of, yasm_dbgfmt *df, FILE *f,
+                     const char *in_filename, int save_input,
+                     yasm_section *def_sect);
 } yasm_parser_module;
 
 #endif

diff --git a/modules/parsers/gas/gas-parser.c b/modules/parsers/gas/gas-parser.c
index 9e215a720591dd5fe1f1a9c2cf8fbfdc3459358b..e8f72ede1e0668475c4f1c026dcee6df6fc0434f 100644 (file)
--- a/modules/parsers/gas/gas-parser.c
+++ b/modules/parsers/gas/gas-parser.c
@@ -38,8 +38,9 @@
 
 static void
 gas_parser_do_parse(yasm_object *object, yasm_preproc *pp, yasm_arch *a,
-                    yasm_objfmt *of, FILE *f, const char *in_filename,
-                    int save_input, yasm_section *def_sect)
+                   yasm_objfmt *of, yasm_dbgfmt *df, FILE *f,
+                   const char *in_filename, int save_input,
+                   yasm_section *def_sect)
 {
     yasm_parser_gas parser_gas;
 
@@ -55,6 +56,7 @@ gas_parser_do_parse(yasm_object *object, yasm_preproc *pp, yasm_arch *a,
     parser_gas.preproc = pp;
     parser_gas.arch = a;
     parser_gas.objfmt = of;
+    parser_gas.dbgfmt = df;
 
     parser_gas.cur_section = def_sect;
     parser_gas.prev_bc = yasm_section_bcs_first(def_sect);

diff --git a/modules/parsers/gas/gas-parser.h b/modules/parsers/gas/gas-parser.h
index 23806c299e8c736a209da18a020a57e8f49f6029..e0f712e9f01a3d1a9f72e0e3660f1720dcc4f38d 100644 (file)
--- a/modules/parsers/gas/gas-parser.h
+++ b/modules/parsers/gas/gas-parser.h
@@ -74,6 +74,7 @@ typedef struct yasm_parser_gas {
     /*@dependent@*/ yasm_preproc *preproc;
     /*@dependent@*/ yasm_arch *arch;
     /*@dependent@*/ yasm_objfmt *objfmt;
+    /*@dependent@*/ yasm_dbgfmt *dbgfmt;
 
     /*@dependent@*/ yasm_linemap *linemap;
     /*@dependent@*/ yasm_symtab *symtab;

diff --git a/modules/parsers/nasm/nasm-parser.c b/modules/parsers/nasm/nasm-parser.c
index 95f23c96a4082d580ffd7c06aaa65e24d8ee6bfd..107b24a7f67f6803c5993b6e6b1e04703913d2b6 100644 (file)
--- a/modules/parsers/nasm/nasm-parser.c
+++ b/modules/parsers/nasm/nasm-parser.c
@@ -35,8 +35,9 @@
 
 static void
 nasm_parser_do_parse(yasm_object *object, yasm_preproc *pp, yasm_arch *a,
-                    yasm_objfmt *of, FILE *f, const char *in_filename,
-                    int save_input, yasm_section *def_sect)
+                    yasm_objfmt *of, yasm_dbgfmt *df, FILE *f,
+                    const char *in_filename, int save_input,
+                    yasm_section *def_sect)
 {
     yasm_parser_nasm parser_nasm;
 
@@ -52,6 +53,7 @@ nasm_parser_do_parse(yasm_object *object, yasm_preproc *pp, yasm_arch *a,
     parser_nasm.preproc = pp;
     parser_nasm.arch = a;
     parser_nasm.objfmt = of;
+    parser_nasm.dbgfmt = df;
 
     parser_nasm.cur_section = def_sect;
     parser_nasm.prev_bc = yasm_section_bcs_first(def_sect);

diff --git a/modules/parsers/nasm/nasm-parser.h b/modules/parsers/nasm/nasm-parser.h
index c2147018fe34c3d2d30104f323c6a3cc2c61016e..d0062d2b84e428ff1d2a499bb09f8e9f26d5ba68 100644 (file)
--- a/modules/parsers/nasm/nasm-parser.h
+++ b/modules/parsers/nasm/nasm-parser.h
@@ -51,6 +51,7 @@ typedef struct yasm_parser_nasm {
     /*@dependent@*/ yasm_preproc *preproc;
     /*@dependent@*/ yasm_arch *arch;
     /*@dependent@*/ yasm_objfmt *objfmt;
+    /*@dependent@*/ yasm_dbgfmt *dbgfmt;
 
     /*@dependent@*/ yasm_linemap *linemap;
     /*@dependent@*/ yasm_symtab *symtab;