only write out functions for the main file when generating JNA declarations

[r28178]

diff --git a/main.c b/main.c
index 1ca12b1..5a58d74 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1191,6 +1191,24 @@ int main(int argc, char **argv)
                                        mode = PrintCaml;
                                } else if (streq(option, "print-jna")) {
                                        mode = PrintJna;
+                               } else if (streq(option, "jna-limit")) {
+                                       ++i;
+                                       if (i >= argc) {
+                                               fprintf(stderr, "error: "
+                                                       "expected argument after '--jna-limit'\n");
+                                               argument_errors = true;
+                                               break;
+                                       }
+                                       jna_limit_output(argv[i]);
+                               } else if (streq(option, "jna-libname")) {
+                                       ++i;
+                                       if (i >= argc) {
+                                               fprintf(stderr, "error: "
+                                                       "expected argument after '--jna-libname'\n");
+                                               argument_errors = true;
+                                               break;
+                                       }
+                                       jna_set_libname(argv[i]);
                                } else if (streq(option, "time")) {
                                        do_timing = true;
                                } else if (streq(option, "version")) {

diff --git a/wrappergen/write_jna.c b/wrappergen/write_jna.c
index 6210b01..f86da8a 100644 (file)
--- a/wrappergen/write_jna.c
+++ b/wrappergen/write_jna.c
@@ -30,11 +30,19 @@
 #include "type.h"
 #include "printer.h"
 #include "adt/error.h"
+#include "adt/xmalloc.h"
 #include <libfirm/adt/pset_new.h>
 
+typedef struct output_limit {
+       const char          *filename;
+       struct output_limit *next;
+} output_limit;
+
 static const scope_t *global_scope;
 static FILE          *out;
 static pset_new_t     avoid_symbols;
+static output_limit  *output_limits;
+static const char    *libname;
 
 static void write_type(type_t *type);
 
@@ -442,6 +450,19 @@ static void write_function(const entity_t *entity)
        fprintf(out, ");\n");
 }
 
+void jna_limit_output(const char *filename)
+{
+       output_limit *limit = xmalloc(sizeof(limit[0]));
+       limit->filename = filename;
+
+       limit->next   = output_limits;
+       output_limits = limit;
+}
+
+void jna_set_libname(const char *new_libname)
+{
+       libname = new_libname;
+}
 
 void write_jna_decls(FILE *output, const translation_unit_t *unit)
 {
@@ -456,10 +477,14 @@ void write_jna_decls(FILE *output, const translation_unit_t *unit)
        fputs("import com.sun.jna.Pointer;\n", out);
        fputs("\n", out);
 
+       const char *register_libname = libname;
+       if (register_libname == NULL)
+               register_libname = "library";
+
        /* TODO: where to get the name from? */
        fputs("public class binding {\n", out);
        fputs("\tstatic {\n", out);
-       fputs("\t\tNative.register(\"firm\");\n", out);
+       fprintf(out, "\t\tNative.register(\"%s\");\n", register_libname);
        fputs("\t}\n", out);
        fputs("\n", out);
 
@@ -513,8 +538,21 @@ void write_jna_decls(FILE *output, const translation_unit_t *unit)
        for ( ; entity != NULL; entity = entity->base.next) {
                if (entity->kind != ENTITY_FUNCTION)
                        continue;
-               if (is_system_header(entity->base.source_position.input_name))
+               const char *input_name = entity->base.source_position.input_name;
+               if (is_system_header(input_name))
                        continue;
+               if (output_limits != NULL) {
+                       bool in_limits = false;
+                       for (output_limit *limit = output_limits; limit != NULL;
+                            limit = limit->next) {
+                           if (strcmp(limit->filename, input_name) == 0) {
+                                       in_limits = true;
+                                       break;
+                               }
+                       }
+                       if (!in_limits)
+                               continue;
+               }
 
                if (pset_new_contains(&avoid_symbols, entity->base.symbol))
                        continue;

diff --git a/wrappergen/write_jna.h b/wrappergen/write_jna.h
index 1c9df09..7c5672c 100644 (file)
--- a/wrappergen/write_jna.h
+++ b/wrappergen/write_jna.h
@@ -22,6 +22,10 @@
 
 #include "ast.h"
 
+void jna_limit_output(const char *filename);
+
+void jna_set_libname(const char *libname);
+
 void write_jna_decls(FILE *out, const translation_unit_t *unit);
 
 #endif