Resolve undefined functions to compiler builtins if they exist.

diff --git a/doc/gmqcc.1 b/doc/gmqcc.1
index 758e08db38de71c1b1e9aa60ea3dc1710d7b330f..2a205bbbeef634870e788eec0abfad1aa90185b9 100644 (file)
--- a/doc/gmqcc.1
+++ b/doc/gmqcc.1
@@ -338,6 +338,12 @@ for QuakeWorld to compile it needs to be treated as a warning
 instead, as such this warning only works when -std=qcc.
 .It Fl W Ns Cm directive-inmacro
 Warn about the use of preprocessor directives inside macros.
 instead, as such this warning only works when -std=qcc.
 .It Fl W Ns Cm directive-inmacro
 Warn about the use of preprocessor directives inside macros.

+.It Fl W Ns Cm builtins
+When using a function that is not explicitly defined, the compiler
+will search its intrinsics table for something that matches that
+function name by appending "__builtin_" to it. This behaviour may
+be unexpected, so enabling this will produce a diagnostic when
+such a function is resolved to a builtin.

 .El
 .Sh COMPILE FLAGS
 .Bl -tag -width Ds
 .El
 .Sh COMPILE FLAGS
 .Bl -tag -width Ds

diff --git a/gmqcc.ini.example b/gmqcc.ini.example
index acff3b3daaecadc5868f60b1363d71b4c5f8040d..0a263df6da6631aeabfb159884ee30c3eb2bd093 100644 (file)
--- a/gmqcc.ini.example
+++ b/gmqcc.ini.example
@@ -537,6 +537,14 @@
     DIRECTIVE_INMACRO = true
 
 
     DIRECTIVE_INMACRO = true
 
 

+    #When using a function that is not explicitly defined, the compiler
+    #will search its intrinsics table for something that matches that
+    #function name by appending "__builtin_" to it. This behaviour may
+    #be unexpected, so enabling this will produce a diagnostic when
+    #such a function is resolved to a builtin.
+
+    BUILTINS = true
+

 
 [optimizations]
     #Some general peephole optimizations. For instance the code `a = b
 
 [optimizations]
     #Some general peephole optimizations. For instance the code `a = b

diff --git a/opts.c b/opts.c
index e50bd7441791925861f046a3420b1d90e6d0454a..e54ec573021fe2c2d1e0707de927bb0322499f2f 100644 (file)
--- a/opts.c
+++ b/opts.c
@@ -92,6 +92,7 @@ static void opts_setdefault(void) {
     opts_set(opts.warn,  WARN_PARENTHESIS,               true);
     opts_set(opts.warn,  WARN_CONST_OVERWRITE,           true);
     opts_set(opts.warn,  WARN_DIRECTIVE_INMACRO,         true);
     opts_set(opts.warn,  WARN_PARENTHESIS,               true);
     opts_set(opts.warn,  WARN_CONST_OVERWRITE,           true);
     opts_set(opts.warn,  WARN_DIRECTIVE_INMACRO,         true);

+    opts_set(opts.warn,  WARN_BUILTINS,                  true);

 
     /* flags */
     opts_set(opts.flags, ADJUST_VECTOR_FIELDS,           true);
 
     /* flags */
     opts_set(opts.flags, ADJUST_VECTOR_FIELDS,           true);

diff --git a/opts.def b/opts.def
index 57625ddb3ce23bde3bbfde21b48e364971cd3bf1..b2099886b0c7913ee028825fcb17bd5b84615fcf 100644 (file)
--- a/opts.def
+++ b/opts.def
@@ -96,6 +96,7 @@
     GMQCC_DEFINE_FLAG(BREAKDEF)
     GMQCC_DEFINE_FLAG(CONST_OVERWRITE)
     GMQCC_DEFINE_FLAG(DIRECTIVE_INMACRO)
     GMQCC_DEFINE_FLAG(BREAKDEF)
     GMQCC_DEFINE_FLAG(CONST_OVERWRITE)
     GMQCC_DEFINE_FLAG(DIRECTIVE_INMACRO)

+    GMQCC_DEFINE_FLAG(BUILTINS)

 #endif
 
 #ifdef GMQCC_TYPE_OPTIMIZATIONS
 #endif
 
 #ifdef GMQCC_TYPE_OPTIMIZATIONS

diff --git a/parser.c b/parser.c
index f03057266d3c71bc37233ffc3e012086192f9451..bb860a4dc41aa63483bd7a6c24e050eed9f67ae9 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -1575,6 +1575,8 @@ static bool parse_sya_operand(parser_t *parser, shunt *sy, bool with_labels)
         if (!var && !strcmp(parser_tokval(parser), "__FUNC__"))
             var = (ast_expression*)fold_constgen_string(parser->fold, parser->function->name, false);
         if (!var) {
         if (!var && !strcmp(parser_tokval(parser), "__FUNC__"))
             var = (ast_expression*)fold_constgen_string(parser->fold, parser->function->name, false);
         if (!var) {

+            char *tryintrinsic = NULL;
+

             /*
              * now we try for the real intrinsic hashtable. If the string
              * begins with __builtin, we simply skip past it, otherwise we
             /*
              * now we try for the real intrinsic hashtable. If the string
              * begins with __builtin, we simply skip past it, otherwise we


@@ -1584,6 +1586,26 @@ static bool parse_sya_operand(parser_t *parser, shunt *sy, bool with_labels)
                 var = intrin_func(parser->intrin, parser_tokval(parser));
             }
 
                 var = intrin_func(parser->intrin, parser_tokval(parser));
             }
 

+            /*
+             * Try it as an instruction by appending __builtin_ to the token
+             * and emit a warning if an intrinsic function matching that
+             * name exists.
+             */
+            if (!var) {
+                util_asprintf(&tryintrinsic, "__builtin_%s", parser_tokval(parser));
+                if ((var = intrin_func(parser->intrin, tryintrinsic))) {
+                    (void)!!compile_warning(
+                        parser_ctx(parser),
+                        WARN_BUILTINS,
+                        "using implicitly defined builtin `%s' for `%s'",
+                        tryintrinsic,
+                        parser_tokval(parser)
+                    );
+                }
+                mem_d(tryintrinsic);
+            }
+
+

             if (!var) {
                 char *correct = NULL;
                 size_t i;
             if (!var) {
                 char *correct = NULL;
                 size_t i;