public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file
@ 2021-06-15 17:17 William Schmidt
0 siblings, 0 replies; 8+ messages in thread
From: William Schmidt @ 2021-06-15 17:17 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:780ff37738b0b745a0241e7d733928be24210566
commit 780ff37738b0b745a0241e7d733928be24210566
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Mon Jun 7 13:20:38 2021 -0500
rs6000: Parsing of overload input file
2021-06-07 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config/rs6000/rs6000-gen-builtins.c (ovld_stanza): New struct.
(MAXOVLDSTANZAS): New macro.
(ovld_stanzas): New variable.
(curr_ovld_stanza): Likewise.
(MAXOVLDS): New macro.
(ovlddata): New struct.
(ovlds): New variable.
(curr_ovld): Likewise.
(max_ovld_args): Likewise.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 235 +++++++++++++++++++++++++++++++-
1 file changed, 234 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index ff3d3b71f3c..b38b7285acb 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -411,8 +411,35 @@ static int curr_bif;
static int *bif_order;
static int bif_index = 0;
+/* Stanzas are groupings of built-in functions and overloads by some
+ common feature/attribute. These definitions are for overload stanzas. */
+struct ovld_stanza
+{
+ char *stanza_id;
+ char *extern_name;
+ char *intern_name;
+ char *ifdef;
+};
+
+#define MAXOVLDSTANZAS 512
+static ovld_stanza ovld_stanzas[MAXOVLDSTANZAS];
static int num_ovld_stanzas;
+static int curr_ovld_stanza;
+
+#define MAXOVLDS 16384
+struct ovlddata
+{
+ int stanza;
+ prototype proto;
+ char *bif_id_name;
+ char *ovld_id_name;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
+static int max_ovld_args = 0;
/* Return codes for parsing routines. */
enum parse_codes
@@ -1515,11 +1542,217 @@ create_bif_order (void)
rbt_inorder_callback (&bifo_rbt, bifo_rbt.rbt_root, set_bif_order);
}
+/* Parse one two-line entry in the overload file. */
+static parse_codes
+parse_ovld_entry (void)
+{
+ /* Check for end of stanza. */
+ pos = 0;
+ consume_whitespace ();
+ if (linebuf[pos] == '[')
+ return PC_EOSTANZA;
+
+ /* Allocate an entry in the overload table. */
+ if (num_ovlds >= MAXOVLDS - 1)
+ {
+ (*diag) ("too many overloads.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld = num_ovlds++;
+ ovlds[curr_ovld].stanza = curr_ovld_stanza;
+
+ if (parse_prototype (&ovlds[curr_ovld].proto) == PC_PARSEFAIL)
+ return PC_PARSEFAIL;
+
+ if (ovlds[curr_ovld].proto.nargs > max_ovld_args)
+ max_ovld_args = ovlds[curr_ovld].proto.nargs;
+
+ /* Now process line 2, which just contains the builtin id and an
+ optional overload id. */
+ if (!advance_line (ovld_file))
+ {
+ (*diag) ("unexpected EOF.\n");
+ return PC_EOFILE;
+ }
+
+ pos = 0;
+ consume_whitespace ();
+ int oldpos = pos;
+ char *id = match_identifier ();
+ ovlds[curr_ovld].bif_id_name = id;
+ ovlds[curr_ovld].ovld_id_name = id;
+ if (!id)
+ {
+ (*diag) ("missing overload id at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+#ifdef DEBUG
+ (*diag) ("ID name is '%s'.\n", id);
+#endif
+
+ /* The builtin id has to match one from the bif file. */
+ if (!rbt_find (&bif_rbt, id))
+ {
+ (*diag) ("builtin ID '%s' not found in bif file.\n", id);
+ return PC_PARSEFAIL;
+ }
+
+ /* Check for an optional overload id. Usually we use the builtin
+ function id for that purpose, but sometimes we need multiple
+ overload entries for the same builtin id, and it needs to be unique. */
+ consume_whitespace ();
+ if (linebuf[pos] != '\n')
+ {
+ id = match_identifier ();
+ ovlds[curr_ovld].ovld_id_name = id;
+ consume_whitespace ();
+ }
+
+ /* Save the overload ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate overload ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ if (linebuf[pos] != '\n')
+ {
+ (*diag) ("garbage at end of line at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ return PC_OK;
+}
+
+/* Parse one stanza of the input overload file. linebuf already contains the
+ first line to parse. */
+static parse_codes
+parse_ovld_stanza (void)
+{
+ /* Parse the stanza header. */
+ pos = 0;
+ consume_whitespace ();
+
+ if (linebuf[pos] != '[')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ char *stanza_name = match_identifier ();
+ if (!stanza_name)
+ {
+ (*diag) ("no identifier found in stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ /* Add the identifier to a table and set the number to be recorded
+ with subsequent overload entries. */
+ if (num_ovld_stanzas >= MAXOVLDSTANZAS)
+ {
+ (*diag) ("too many stanza headers.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld_stanza = num_ovld_stanzas++;
+ ovld_stanza *stanza = &ovld_stanzas[curr_ovld_stanza];
+ stanza->stanza_id = stanza_name;
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->extern_name = match_identifier ();
+ if (!stanza->extern_name)
+ {
+ (*diag) ("missing external name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->intern_name = match_identifier ();
+ if (!stanza->intern_name)
+ {
+ (*diag) ("missing internal name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] == ',')
+ {
+ safe_inc_pos ();
+ consume_whitespace ();
+ stanza->ifdef = match_identifier ();
+ if (!stanza->ifdef)
+ {
+ (*diag) ("missing ifdef token at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ consume_whitespace ();
+ }
+ else
+ stanza->ifdef = 0;
+
+ if (linebuf[pos] != ']')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n' && pos != LINELEN - 1)
+ {
+ (*diag) ("garbage after stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ parse_codes result = PC_OK;
+
+ while (result != PC_EOSTANZA)
+ {
+ if (!advance_line (ovld_file))
+ return PC_EOFILE;
+
+ result = parse_ovld_entry ();
+ if (result == PC_EOFILE || result == PC_PARSEFAIL)
+ return result;
+ }
+
+ return PC_OK;
+}
+
/* Parse the overload file. */
static parse_codes
parse_ovld (void)
{
- return PC_OK;
+ parse_codes result = PC_OK;
+ diag = &ovld_diag;
+
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ while (result == PC_OK)
+ result = parse_ovld_stanza ();
+
+ if (result == PC_EOFILE)
+ return PC_OK;
+ return result;
}
/* Write everything to the header file (rs6000-builtins.h). */
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file
@ 2021-06-25 16:15 William Schmidt
0 siblings, 0 replies; 8+ messages in thread
From: William Schmidt @ 2021-06-25 16:15 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:b1f49e45fdc28a2a1197676b12f8925076ed6b22
commit b1f49e45fdc28a2a1197676b12f8925076ed6b22
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Mon Jun 7 13:20:38 2021 -0500
rs6000: Parsing of overload input file
2021-06-07 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config/rs6000/rs6000-gen-builtins.c (ovld_stanza): New struct.
(MAXOVLDSTANZAS): New macro.
(ovld_stanzas): New variable.
(curr_ovld_stanza): Likewise.
(MAXOVLDS): New macro.
(ovlddata): New struct.
(ovlds): New variable.
(curr_ovld): Likewise.
(max_ovld_args): Likewise.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 235 +++++++++++++++++++++++++++++++-
1 file changed, 234 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index ff3d3b71f3c..b38b7285acb 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -411,8 +411,35 @@ static int curr_bif;
static int *bif_order;
static int bif_index = 0;
+/* Stanzas are groupings of built-in functions and overloads by some
+ common feature/attribute. These definitions are for overload stanzas. */
+struct ovld_stanza
+{
+ char *stanza_id;
+ char *extern_name;
+ char *intern_name;
+ char *ifdef;
+};
+
+#define MAXOVLDSTANZAS 512
+static ovld_stanza ovld_stanzas[MAXOVLDSTANZAS];
static int num_ovld_stanzas;
+static int curr_ovld_stanza;
+
+#define MAXOVLDS 16384
+struct ovlddata
+{
+ int stanza;
+ prototype proto;
+ char *bif_id_name;
+ char *ovld_id_name;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
+static int max_ovld_args = 0;
/* Return codes for parsing routines. */
enum parse_codes
@@ -1515,11 +1542,217 @@ create_bif_order (void)
rbt_inorder_callback (&bifo_rbt, bifo_rbt.rbt_root, set_bif_order);
}
+/* Parse one two-line entry in the overload file. */
+static parse_codes
+parse_ovld_entry (void)
+{
+ /* Check for end of stanza. */
+ pos = 0;
+ consume_whitespace ();
+ if (linebuf[pos] == '[')
+ return PC_EOSTANZA;
+
+ /* Allocate an entry in the overload table. */
+ if (num_ovlds >= MAXOVLDS - 1)
+ {
+ (*diag) ("too many overloads.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld = num_ovlds++;
+ ovlds[curr_ovld].stanza = curr_ovld_stanza;
+
+ if (parse_prototype (&ovlds[curr_ovld].proto) == PC_PARSEFAIL)
+ return PC_PARSEFAIL;
+
+ if (ovlds[curr_ovld].proto.nargs > max_ovld_args)
+ max_ovld_args = ovlds[curr_ovld].proto.nargs;
+
+ /* Now process line 2, which just contains the builtin id and an
+ optional overload id. */
+ if (!advance_line (ovld_file))
+ {
+ (*diag) ("unexpected EOF.\n");
+ return PC_EOFILE;
+ }
+
+ pos = 0;
+ consume_whitespace ();
+ int oldpos = pos;
+ char *id = match_identifier ();
+ ovlds[curr_ovld].bif_id_name = id;
+ ovlds[curr_ovld].ovld_id_name = id;
+ if (!id)
+ {
+ (*diag) ("missing overload id at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+#ifdef DEBUG
+ (*diag) ("ID name is '%s'.\n", id);
+#endif
+
+ /* The builtin id has to match one from the bif file. */
+ if (!rbt_find (&bif_rbt, id))
+ {
+ (*diag) ("builtin ID '%s' not found in bif file.\n", id);
+ return PC_PARSEFAIL;
+ }
+
+ /* Check for an optional overload id. Usually we use the builtin
+ function id for that purpose, but sometimes we need multiple
+ overload entries for the same builtin id, and it needs to be unique. */
+ consume_whitespace ();
+ if (linebuf[pos] != '\n')
+ {
+ id = match_identifier ();
+ ovlds[curr_ovld].ovld_id_name = id;
+ consume_whitespace ();
+ }
+
+ /* Save the overload ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate overload ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ if (linebuf[pos] != '\n')
+ {
+ (*diag) ("garbage at end of line at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ return PC_OK;
+}
+
+/* Parse one stanza of the input overload file. linebuf already contains the
+ first line to parse. */
+static parse_codes
+parse_ovld_stanza (void)
+{
+ /* Parse the stanza header. */
+ pos = 0;
+ consume_whitespace ();
+
+ if (linebuf[pos] != '[')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ char *stanza_name = match_identifier ();
+ if (!stanza_name)
+ {
+ (*diag) ("no identifier found in stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ /* Add the identifier to a table and set the number to be recorded
+ with subsequent overload entries. */
+ if (num_ovld_stanzas >= MAXOVLDSTANZAS)
+ {
+ (*diag) ("too many stanza headers.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld_stanza = num_ovld_stanzas++;
+ ovld_stanza *stanza = &ovld_stanzas[curr_ovld_stanza];
+ stanza->stanza_id = stanza_name;
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->extern_name = match_identifier ();
+ if (!stanza->extern_name)
+ {
+ (*diag) ("missing external name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->intern_name = match_identifier ();
+ if (!stanza->intern_name)
+ {
+ (*diag) ("missing internal name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] == ',')
+ {
+ safe_inc_pos ();
+ consume_whitespace ();
+ stanza->ifdef = match_identifier ();
+ if (!stanza->ifdef)
+ {
+ (*diag) ("missing ifdef token at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ consume_whitespace ();
+ }
+ else
+ stanza->ifdef = 0;
+
+ if (linebuf[pos] != ']')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n' && pos != LINELEN - 1)
+ {
+ (*diag) ("garbage after stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ parse_codes result = PC_OK;
+
+ while (result != PC_EOSTANZA)
+ {
+ if (!advance_line (ovld_file))
+ return PC_EOFILE;
+
+ result = parse_ovld_entry ();
+ if (result == PC_EOFILE || result == PC_PARSEFAIL)
+ return result;
+ }
+
+ return PC_OK;
+}
+
/* Parse the overload file. */
static parse_codes
parse_ovld (void)
{
- return PC_OK;
+ parse_codes result = PC_OK;
+ diag = &ovld_diag;
+
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ while (result == PC_OK)
+ result = parse_ovld_stanza ();
+
+ if (result == PC_EOFILE)
+ return PC_OK;
+ return result;
}
/* Write everything to the header file (rs6000-builtins.h). */
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file
@ 2021-04-26 20:49 William Schmidt
0 siblings, 0 replies; 8+ messages in thread
From: William Schmidt @ 2021-04-26 20:49 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:236c10ed9259b70327ee3404dc89ec8a7ca2f51d
commit 236c10ed9259b70327ee3404dc89ec8a7ca2f51d
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Mar 3 16:16:26 2021 -0600
rs6000: Parsing of overload input file
2021-03-03 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config/rs6000/rs6000-gen-builtins.c (ovld_stanza): New struct.
(MAXOVLDSTANZAS): New defined constant.
(ovld_stanzas): New filescope variable.
(curr_ovld_stanza): Likewise.
(MAXOVLDS): New defined constant.
(ovlddata): New struct.
(ovlds): New filescope variable.
(curr_ovld): Likewise.
(max_ovld_args): Likewise.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 233 +++++++++++++++++++++++++++++++-
1 file changed, 232 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 68569bda50e..d5deefbfd3b 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -405,8 +405,33 @@ static int curr_bif;
static int *bif_order;
static int bif_index = 0;
+/* Stanzas are groupings of built-in functions and overloads by some
+ common feature/attribute. These definitions are for overload stanzas. */
+struct ovld_stanza {
+ char *stanza_id;
+ char *extern_name;
+ char *intern_name;
+ char *ifdef;
+};
+
+#define MAXOVLDSTANZAS 512
+static ovld_stanza ovld_stanzas[MAXOVLDSTANZAS];
static int num_ovld_stanzas;
+static int curr_ovld_stanza;
+
+#define MAXOVLDS 16384
+struct ovlddata {
+ int stanza;
+ prototype proto;
+ char *bif_id_name;
+ char *ovld_id_name;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
+static int max_ovld_args = 0;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1551,11 +1576,217 @@ create_bif_order ()
rbt_inorder_callback (&bifo_rbt, bifo_rbt.rbt_root, set_bif_order);
}
+/* Parse one two-line entry in the overload file. */
+static parse_codes
+parse_ovld_entry ()
+{
+ /* Check for end of stanza. */
+ pos = 0;
+ consume_whitespace ();
+ if (linebuf[pos] == '[')
+ return PC_EOSTANZA;
+
+ /* Allocate an entry in the overload table. */
+ if (num_ovlds >= MAXOVLDS - 1)
+ {
+ (*diag) ("too many overloads.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld = num_ovlds++;
+ ovlds[curr_ovld].stanza = curr_ovld_stanza;
+
+ if (parse_prototype (&ovlds[curr_ovld].proto) == PC_PARSEFAIL)
+ return PC_PARSEFAIL;
+
+ if (ovlds[curr_ovld].proto.nargs > max_ovld_args)
+ max_ovld_args = ovlds[curr_ovld].proto.nargs;
+
+ /* Now process line 2, which just contains the builtin id and an
+ optional overload id. */
+ if (!advance_line (ovld_file))
+ {
+ (*diag) ("unexpected EOF.\n");
+ return PC_EOFILE;
+ }
+
+ pos = 0;
+ consume_whitespace ();
+ int oldpos = pos;
+ char *id = match_identifier ();
+ ovlds[curr_ovld].bif_id_name = id;
+ ovlds[curr_ovld].ovld_id_name = id;
+ if (!id)
+ {
+ (*diag) ("missing overload id at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+#ifdef DEBUG
+ (*diag) ("ID name is '%s'.\n", id);
+#endif
+
+ /* The builtin id has to match one from the bif file. */
+ if (!rbt_find (&bif_rbt, id))
+ {
+ (*diag) ("builtin ID '%s' not found in bif file.\n", id);
+ return PC_PARSEFAIL;
+ }
+
+ /* Check for an optional overload id. Usually we use the builtin
+ function id for that purpose, but sometimes we need multiple
+ overload entries for the same builtin id, and it needs to be unique. */
+ consume_whitespace ();
+ if (linebuf[pos] != '\n')
+ {
+ id = match_identifier ();
+ ovlds[curr_ovld].ovld_id_name = id;
+ consume_whitespace ();
+ }
+
+ /* Save the overload ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate overload ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ if (linebuf[pos] != '\n')
+ {
+ (*diag) ("garbage at end of line at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ return PC_OK;
+}
+
+/* Parse one stanza of the input overload file. linebuf already contains the
+ first line to parse. */
+static parse_codes
+parse_ovld_stanza ()
+{
+ /* Parse the stanza header. */
+ pos = 0;
+ consume_whitespace ();
+
+ if (linebuf[pos] != '[')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ char *stanza_name = match_identifier ();
+ if (!stanza_name)
+ {
+ (*diag) ("no identifier found in stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ /* Add the identifier to a table and set the number to be recorded
+ with subsequent overload entries. */
+ if (num_ovld_stanzas >= MAXOVLDSTANZAS)
+ {
+ (*diag) ("too many stanza headers.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld_stanza = num_ovld_stanzas++;
+ ovld_stanza *stanza = &ovld_stanzas[curr_ovld_stanza];
+ stanza->stanza_id = stanza_name;
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->extern_name = match_identifier ();
+ if (!stanza->extern_name)
+ {
+ (*diag) ("missing external name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->intern_name = match_identifier ();
+ if (!stanza->intern_name)
+ {
+ (*diag) ("missing internal name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] == ',')
+ {
+ safe_inc_pos ();
+ consume_whitespace ();
+ stanza->ifdef = match_identifier ();
+ if (!stanza->ifdef)
+ {
+ (*diag) ("missing ifdef token at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ consume_whitespace ();
+ }
+ else
+ stanza->ifdef = 0;
+
+ if (linebuf[pos] != ']')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n' && pos != LINELEN - 1)
+ {
+ (*diag) ("garbage after stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ parse_codes result = PC_OK;
+
+ while (result != PC_EOSTANZA)
+ {
+ if (!advance_line (ovld_file))
+ return PC_EOFILE;
+
+ result = parse_ovld_entry ();
+ if (result == PC_EOFILE || result == PC_PARSEFAIL)
+ return result;
+ }
+
+ return PC_OK;
+}
+
/* Parse the overload file. */
static parse_codes
parse_ovld ()
{
- return PC_OK;
+ parse_codes result = PC_OK;
+ diag = &ovld_diag;
+
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ while (result == PC_OK)
+ result = parse_ovld_stanza ();
+
+ if (result == PC_EOFILE)
+ return PC_OK;
+ return result;
}
/* Write everything to the header file (rs6000-builtins.h). */
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file
@ 2021-04-02 22:09 William Schmidt
0 siblings, 0 replies; 8+ messages in thread
From: William Schmidt @ 2021-04-02 22:09 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:90cfe8db352065237faedb0a949e75a2ef744393
commit 90cfe8db352065237faedb0a949e75a2ef744393
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Mar 3 16:16:26 2021 -0600
rs6000: Parsing of overload input file
2021-03-03 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config/rs6000/rs6000-gen-builtins.c (ovld_stanza): New struct.
(MAXOVLDSTANZAS): New defined constant.
(ovld_stanzas): New filescope variable.
(curr_ovld_stanza): Likewise.
(MAXOVLDS): New defined constant.
(ovlddata): New struct.
(ovlds): New filescope variable.
(curr_ovld): Likewise.
(max_ovld_args): Likewise.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 233 +++++++++++++++++++++++++++++++-
1 file changed, 232 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 68569bda50e..d5deefbfd3b 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -405,8 +405,33 @@ static int curr_bif;
static int *bif_order;
static int bif_index = 0;
+/* Stanzas are groupings of built-in functions and overloads by some
+ common feature/attribute. These definitions are for overload stanzas. */
+struct ovld_stanza {
+ char *stanza_id;
+ char *extern_name;
+ char *intern_name;
+ char *ifdef;
+};
+
+#define MAXOVLDSTANZAS 512
+static ovld_stanza ovld_stanzas[MAXOVLDSTANZAS];
static int num_ovld_stanzas;
+static int curr_ovld_stanza;
+
+#define MAXOVLDS 16384
+struct ovlddata {
+ int stanza;
+ prototype proto;
+ char *bif_id_name;
+ char *ovld_id_name;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
+static int max_ovld_args = 0;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1551,11 +1576,217 @@ create_bif_order ()
rbt_inorder_callback (&bifo_rbt, bifo_rbt.rbt_root, set_bif_order);
}
+/* Parse one two-line entry in the overload file. */
+static parse_codes
+parse_ovld_entry ()
+{
+ /* Check for end of stanza. */
+ pos = 0;
+ consume_whitespace ();
+ if (linebuf[pos] == '[')
+ return PC_EOSTANZA;
+
+ /* Allocate an entry in the overload table. */
+ if (num_ovlds >= MAXOVLDS - 1)
+ {
+ (*diag) ("too many overloads.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld = num_ovlds++;
+ ovlds[curr_ovld].stanza = curr_ovld_stanza;
+
+ if (parse_prototype (&ovlds[curr_ovld].proto) == PC_PARSEFAIL)
+ return PC_PARSEFAIL;
+
+ if (ovlds[curr_ovld].proto.nargs > max_ovld_args)
+ max_ovld_args = ovlds[curr_ovld].proto.nargs;
+
+ /* Now process line 2, which just contains the builtin id and an
+ optional overload id. */
+ if (!advance_line (ovld_file))
+ {
+ (*diag) ("unexpected EOF.\n");
+ return PC_EOFILE;
+ }
+
+ pos = 0;
+ consume_whitespace ();
+ int oldpos = pos;
+ char *id = match_identifier ();
+ ovlds[curr_ovld].bif_id_name = id;
+ ovlds[curr_ovld].ovld_id_name = id;
+ if (!id)
+ {
+ (*diag) ("missing overload id at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+#ifdef DEBUG
+ (*diag) ("ID name is '%s'.\n", id);
+#endif
+
+ /* The builtin id has to match one from the bif file. */
+ if (!rbt_find (&bif_rbt, id))
+ {
+ (*diag) ("builtin ID '%s' not found in bif file.\n", id);
+ return PC_PARSEFAIL;
+ }
+
+ /* Check for an optional overload id. Usually we use the builtin
+ function id for that purpose, but sometimes we need multiple
+ overload entries for the same builtin id, and it needs to be unique. */
+ consume_whitespace ();
+ if (linebuf[pos] != '\n')
+ {
+ id = match_identifier ();
+ ovlds[curr_ovld].ovld_id_name = id;
+ consume_whitespace ();
+ }
+
+ /* Save the overload ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate overload ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ if (linebuf[pos] != '\n')
+ {
+ (*diag) ("garbage at end of line at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ return PC_OK;
+}
+
+/* Parse one stanza of the input overload file. linebuf already contains the
+ first line to parse. */
+static parse_codes
+parse_ovld_stanza ()
+{
+ /* Parse the stanza header. */
+ pos = 0;
+ consume_whitespace ();
+
+ if (linebuf[pos] != '[')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ char *stanza_name = match_identifier ();
+ if (!stanza_name)
+ {
+ (*diag) ("no identifier found in stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ /* Add the identifier to a table and set the number to be recorded
+ with subsequent overload entries. */
+ if (num_ovld_stanzas >= MAXOVLDSTANZAS)
+ {
+ (*diag) ("too many stanza headers.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld_stanza = num_ovld_stanzas++;
+ ovld_stanza *stanza = &ovld_stanzas[curr_ovld_stanza];
+ stanza->stanza_id = stanza_name;
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->extern_name = match_identifier ();
+ if (!stanza->extern_name)
+ {
+ (*diag) ("missing external name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->intern_name = match_identifier ();
+ if (!stanza->intern_name)
+ {
+ (*diag) ("missing internal name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] == ',')
+ {
+ safe_inc_pos ();
+ consume_whitespace ();
+ stanza->ifdef = match_identifier ();
+ if (!stanza->ifdef)
+ {
+ (*diag) ("missing ifdef token at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ consume_whitespace ();
+ }
+ else
+ stanza->ifdef = 0;
+
+ if (linebuf[pos] != ']')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n' && pos != LINELEN - 1)
+ {
+ (*diag) ("garbage after stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ parse_codes result = PC_OK;
+
+ while (result != PC_EOSTANZA)
+ {
+ if (!advance_line (ovld_file))
+ return PC_EOFILE;
+
+ result = parse_ovld_entry ();
+ if (result == PC_EOFILE || result == PC_PARSEFAIL)
+ return result;
+ }
+
+ return PC_OK;
+}
+
/* Parse the overload file. */
static parse_codes
parse_ovld ()
{
- return PC_OK;
+ parse_codes result = PC_OK;
+ diag = &ovld_diag;
+
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ while (result == PC_OK)
+ result = parse_ovld_stanza ();
+
+ if (result == PC_EOFILE)
+ return PC_OK;
+ return result;
}
/* Write everything to the header file (rs6000-builtins.h). */
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file
@ 2021-04-01 19:48 William Schmidt
0 siblings, 0 replies; 8+ messages in thread
From: William Schmidt @ 2021-04-01 19:48 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:45042ea885b0fb5f8f36bc04521b4f19cdefdd59
commit 45042ea885b0fb5f8f36bc04521b4f19cdefdd59
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Mar 24 13:54:45 2021 -0500
rs6000: Parsing of overload input file
2021-03-24 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config/rs6000/rs6000-gen-builtins.c (write_defines_file):
Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index b085ceb7ae3..f886fe8b2e9 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -2039,6 +2039,23 @@ write_init_file ()
static int
write_defines_file ()
{
+ fprintf (defines_file, "#ifndef _RS6000_VECDEFINES_H\n");
+ fprintf (defines_file, "#define _RS6000_VECDEFINES_H 1\n\n");
+ fprintf (defines_file, "#if defined(_ARCH_PPC64) && defined (_ARCH_PWR9)\n");
+ fprintf (defines_file, " #define _ARCH_PPC64_PWR9 1\n");
+ fprintf (defines_file, "#endif\n\n");
+ for (int i = 0; i < num_ovld_stanzas; i++)
+ if (strcmp (ovld_stanzas[i].extern_name, "SKIP"))
+ {
+ if (ovld_stanzas[i].ifdef)
+ fprintf (defines_file, "#ifdef %s\n", ovld_stanzas[i].ifdef);
+ fprintf (defines_file, "#define %s %s\n",
+ ovld_stanzas[i].extern_name,
+ ovld_stanzas[i].intern_name);
+ if (ovld_stanzas[i].ifdef)
+ fprintf (defines_file, "#endif\n");
+ }
+ fprintf (defines_file, "\n#endif\n");
return 1;
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file
@ 2021-04-01 19:48 William Schmidt
0 siblings, 0 replies; 8+ messages in thread
From: William Schmidt @ 2021-04-01 19:48 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:8ce366add001ec1ac243b94ffe5862d92fc08d36
commit 8ce366add001ec1ac243b94ffe5862d92fc08d36
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Mar 3 16:16:26 2021 -0600
rs6000: Parsing of overload input file
2021-03-03 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config/rs6000/rs6000-gen-builtins.c (ovld_stanza): New struct.
(MAXOVLDSTANZAS): New defined constant.
(ovld_stanzas): New filescope variable.
(curr_ovld_stanza): Likewise.
(MAXOVLDS): New defined constant.
(ovlddata): New struct.
(ovlds): New filescope variable.
(curr_ovld): Likewise.
(max_ovld_args): Likewise.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 233 +++++++++++++++++++++++++++++++-
1 file changed, 232 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 979d2afbc20..36a2f3b9991 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -404,8 +404,33 @@ static int curr_bif;
static int *bif_order;
static int bif_index = 0;
+/* Stanzas are groupings of built-in functions and overloads by some
+ common feature/attribute. These definitions are for overload stanzas. */
+struct ovld_stanza {
+ char *stanza_id;
+ char *extern_name;
+ char *intern_name;
+ char *ifdef;
+};
+
+#define MAXOVLDSTANZAS 512
+static ovld_stanza ovld_stanzas[MAXOVLDSTANZAS];
static int num_ovld_stanzas;
+static int curr_ovld_stanza;
+
+#define MAXOVLDS 16384
+struct ovlddata {
+ int stanza;
+ prototype proto;
+ char *bif_id_name;
+ char *ovld_id_name;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
+static int max_ovld_args = 0;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1550,11 +1575,217 @@ create_bif_order ()
rbt_inorder_callback (&bifo_rbt, bifo_rbt.rbt_root, set_bif_order);
}
+/* Parse one two-line entry in the overload file. */
+static parse_codes
+parse_ovld_entry ()
+{
+ /* Check for end of stanza. */
+ pos = 0;
+ consume_whitespace ();
+ if (linebuf[pos] == '[')
+ return PC_EOSTANZA;
+
+ /* Allocate an entry in the overload table. */
+ if (num_ovlds >= MAXOVLDS - 1)
+ {
+ (*diag) ("too many overloads.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld = num_ovlds++;
+ ovlds[curr_ovld].stanza = curr_ovld_stanza;
+
+ if (parse_prototype (&ovlds[curr_ovld].proto) == PC_PARSEFAIL)
+ return PC_PARSEFAIL;
+
+ if (ovlds[curr_ovld].proto.nargs > max_ovld_args)
+ max_ovld_args = ovlds[curr_ovld].proto.nargs;
+
+ /* Now process line 2, which just contains the builtin id and an
+ optional overload id. */
+ if (!advance_line (ovld_file))
+ {
+ (*diag) ("unexpected EOF.\n");
+ return PC_EOFILE;
+ }
+
+ pos = 0;
+ consume_whitespace ();
+ int oldpos = pos;
+ char *id = match_identifier ();
+ ovlds[curr_ovld].bif_id_name = id;
+ ovlds[curr_ovld].ovld_id_name = id;
+ if (!id)
+ {
+ (*diag) ("missing overload id at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+#ifdef DEBUG
+ (*diag) ("ID name is '%s'.\n", id);
+#endif
+
+ /* The builtin id has to match one from the bif file. */
+ if (!rbt_find (&bif_rbt, id))
+ {
+ (*diag) ("builtin ID '%s' not found in bif file.\n", id);
+ return PC_PARSEFAIL;
+ }
+
+ /* Check for an optional overload id. Usually we use the builtin
+ function id for that purpose, but sometimes we need multiple
+ overload entries for the same builtin id, and it needs to be unique. */
+ consume_whitespace ();
+ if (linebuf[pos] != '\n')
+ {
+ id = match_identifier ();
+ ovlds[curr_ovld].ovld_id_name = id;
+ consume_whitespace ();
+ }
+
+ /* Save the overload ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate overload ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ if (linebuf[pos] != '\n')
+ {
+ (*diag) ("garbage at end of line at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ return PC_OK;
+}
+
+/* Parse one stanza of the input overload file. linebuf already contains the
+ first line to parse. */
+static parse_codes
+parse_ovld_stanza ()
+{
+ /* Parse the stanza header. */
+ pos = 0;
+ consume_whitespace ();
+
+ if (linebuf[pos] != '[')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ char *stanza_name = match_identifier ();
+ if (!stanza_name)
+ {
+ (*diag) ("no identifier found in stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ /* Add the identifier to a table and set the number to be recorded
+ with subsequent overload entries. */
+ if (num_ovld_stanzas >= MAXOVLDSTANZAS)
+ {
+ (*diag) ("too many stanza headers.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld_stanza = num_ovld_stanzas++;
+ ovld_stanza *stanza = &ovld_stanzas[curr_ovld_stanza];
+ stanza->stanza_id = stanza_name;
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->extern_name = match_identifier ();
+ if (!stanza->extern_name)
+ {
+ (*diag) ("missing external name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->intern_name = match_identifier ();
+ if (!stanza->intern_name)
+ {
+ (*diag) ("missing internal name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] == ',')
+ {
+ safe_inc_pos ();
+ consume_whitespace ();
+ stanza->ifdef = match_identifier ();
+ if (!stanza->ifdef)
+ {
+ (*diag) ("missing ifdef token at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ consume_whitespace ();
+ }
+ else
+ stanza->ifdef = 0;
+
+ if (linebuf[pos] != ']')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n' && pos != LINELEN - 1)
+ {
+ (*diag) ("garbage after stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ parse_codes result = PC_OK;
+
+ while (result != PC_EOSTANZA)
+ {
+ if (!advance_line (ovld_file))
+ return PC_EOFILE;
+
+ result = parse_ovld_entry ();
+ if (result == PC_EOFILE || result == PC_PARSEFAIL)
+ return result;
+ }
+
+ return PC_OK;
+}
+
/* Parse the overload file. */
static parse_codes
parse_ovld ()
{
- return PC_OK;
+ parse_codes result = PC_OK;
+ diag = &ovld_diag;
+
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ while (result == PC_OK)
+ result = parse_ovld_stanza ();
+
+ if (result == PC_EOFILE)
+ return PC_OK;
+ return result;
}
/* Write everything to the header file (rs6000-builtins.h). */
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file
@ 2021-03-25 15:45 William Schmidt
0 siblings, 0 replies; 8+ messages in thread
From: William Schmidt @ 2021-03-25 15:45 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:043ea7b62401abf6ab059651792c91fdabb9e34d
commit 043ea7b62401abf6ab059651792c91fdabb9e34d
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Mar 24 13:54:45 2021 -0500
rs6000: Parsing of overload input file
2021-03-24 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config/rs6000/rs6000-gen-builtins.c (write_defines_file):
Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index b085ceb7ae3..f886fe8b2e9 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -2039,6 +2039,23 @@ write_init_file ()
static int
write_defines_file ()
{
+ fprintf (defines_file, "#ifndef _RS6000_VECDEFINES_H\n");
+ fprintf (defines_file, "#define _RS6000_VECDEFINES_H 1\n\n");
+ fprintf (defines_file, "#if defined(_ARCH_PPC64) && defined (_ARCH_PWR9)\n");
+ fprintf (defines_file, " #define _ARCH_PPC64_PWR9 1\n");
+ fprintf (defines_file, "#endif\n\n");
+ for (int i = 0; i < num_ovld_stanzas; i++)
+ if (strcmp (ovld_stanzas[i].extern_name, "SKIP"))
+ {
+ if (ovld_stanzas[i].ifdef)
+ fprintf (defines_file, "#ifdef %s\n", ovld_stanzas[i].ifdef);
+ fprintf (defines_file, "#define %s %s\n",
+ ovld_stanzas[i].extern_name,
+ ovld_stanzas[i].intern_name);
+ if (ovld_stanzas[i].ifdef)
+ fprintf (defines_file, "#endif\n");
+ }
+ fprintf (defines_file, "\n#endif\n");
return 1;
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file
@ 2021-03-25 15:45 William Schmidt
0 siblings, 0 replies; 8+ messages in thread
From: William Schmidt @ 2021-03-25 15:45 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:975668412b93c1784774602ea231dcd24a7ead72
commit 975668412b93c1784774602ea231dcd24a7ead72
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Mar 3 16:16:26 2021 -0600
rs6000: Parsing of overload input file
2021-03-03 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config/rs6000/rs6000-gen-builtins.c (ovld_stanza): New struct.
(MAXOVLDSTANZAS): New defined constant.
(ovld_stanzas): New filescope variable.
(curr_ovld_stanza): Likewise.
(MAXOVLDS): New defined constant.
(ovlddata): New struct.
(ovlds): New filescope variable.
(curr_ovld): Likewise.
(max_ovld_args): Likewise.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 233 +++++++++++++++++++++++++++++++-
1 file changed, 232 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 979d2afbc20..36a2f3b9991 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -404,8 +404,33 @@ static int curr_bif;
static int *bif_order;
static int bif_index = 0;
+/* Stanzas are groupings of built-in functions and overloads by some
+ common feature/attribute. These definitions are for overload stanzas. */
+struct ovld_stanza {
+ char *stanza_id;
+ char *extern_name;
+ char *intern_name;
+ char *ifdef;
+};
+
+#define MAXOVLDSTANZAS 512
+static ovld_stanza ovld_stanzas[MAXOVLDSTANZAS];
static int num_ovld_stanzas;
+static int curr_ovld_stanza;
+
+#define MAXOVLDS 16384
+struct ovlddata {
+ int stanza;
+ prototype proto;
+ char *bif_id_name;
+ char *ovld_id_name;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
+static int max_ovld_args = 0;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1550,11 +1575,217 @@ create_bif_order ()
rbt_inorder_callback (&bifo_rbt, bifo_rbt.rbt_root, set_bif_order);
}
+/* Parse one two-line entry in the overload file. */
+static parse_codes
+parse_ovld_entry ()
+{
+ /* Check for end of stanza. */
+ pos = 0;
+ consume_whitespace ();
+ if (linebuf[pos] == '[')
+ return PC_EOSTANZA;
+
+ /* Allocate an entry in the overload table. */
+ if (num_ovlds >= MAXOVLDS - 1)
+ {
+ (*diag) ("too many overloads.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld = num_ovlds++;
+ ovlds[curr_ovld].stanza = curr_ovld_stanza;
+
+ if (parse_prototype (&ovlds[curr_ovld].proto) == PC_PARSEFAIL)
+ return PC_PARSEFAIL;
+
+ if (ovlds[curr_ovld].proto.nargs > max_ovld_args)
+ max_ovld_args = ovlds[curr_ovld].proto.nargs;
+
+ /* Now process line 2, which just contains the builtin id and an
+ optional overload id. */
+ if (!advance_line (ovld_file))
+ {
+ (*diag) ("unexpected EOF.\n");
+ return PC_EOFILE;
+ }
+
+ pos = 0;
+ consume_whitespace ();
+ int oldpos = pos;
+ char *id = match_identifier ();
+ ovlds[curr_ovld].bif_id_name = id;
+ ovlds[curr_ovld].ovld_id_name = id;
+ if (!id)
+ {
+ (*diag) ("missing overload id at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+#ifdef DEBUG
+ (*diag) ("ID name is '%s'.\n", id);
+#endif
+
+ /* The builtin id has to match one from the bif file. */
+ if (!rbt_find (&bif_rbt, id))
+ {
+ (*diag) ("builtin ID '%s' not found in bif file.\n", id);
+ return PC_PARSEFAIL;
+ }
+
+ /* Check for an optional overload id. Usually we use the builtin
+ function id for that purpose, but sometimes we need multiple
+ overload entries for the same builtin id, and it needs to be unique. */
+ consume_whitespace ();
+ if (linebuf[pos] != '\n')
+ {
+ id = match_identifier ();
+ ovlds[curr_ovld].ovld_id_name = id;
+ consume_whitespace ();
+ }
+
+ /* Save the overload ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate overload ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ if (linebuf[pos] != '\n')
+ {
+ (*diag) ("garbage at end of line at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ return PC_OK;
+}
+
+/* Parse one stanza of the input overload file. linebuf already contains the
+ first line to parse. */
+static parse_codes
+parse_ovld_stanza ()
+{
+ /* Parse the stanza header. */
+ pos = 0;
+ consume_whitespace ();
+
+ if (linebuf[pos] != '[')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ char *stanza_name = match_identifier ();
+ if (!stanza_name)
+ {
+ (*diag) ("no identifier found in stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ /* Add the identifier to a table and set the number to be recorded
+ with subsequent overload entries. */
+ if (num_ovld_stanzas >= MAXOVLDSTANZAS)
+ {
+ (*diag) ("too many stanza headers.\n");
+ return PC_PARSEFAIL;
+ }
+
+ curr_ovld_stanza = num_ovld_stanzas++;
+ ovld_stanza *stanza = &ovld_stanzas[curr_ovld_stanza];
+ stanza->stanza_id = stanza_name;
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->extern_name = match_identifier ();
+ if (!stanza->extern_name)
+ {
+ (*diag) ("missing external name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ stanza->intern_name = match_identifier ();
+ if (!stanza->intern_name)
+ {
+ (*diag) ("missing internal name at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] == ',')
+ {
+ safe_inc_pos ();
+ consume_whitespace ();
+ stanza->ifdef = match_identifier ();
+ if (!stanza->ifdef)
+ {
+ (*diag) ("missing ifdef token at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ consume_whitespace ();
+ }
+ else
+ stanza->ifdef = 0;
+
+ if (linebuf[pos] != ']')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return PC_PARSEFAIL;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n' && pos != LINELEN - 1)
+ {
+ (*diag) ("garbage after stanza header.\n");
+ return PC_PARSEFAIL;
+ }
+
+ parse_codes result = PC_OK;
+
+ while (result != PC_EOSTANZA)
+ {
+ if (!advance_line (ovld_file))
+ return PC_EOFILE;
+
+ result = parse_ovld_entry ();
+ if (result == PC_EOFILE || result == PC_PARSEFAIL)
+ return result;
+ }
+
+ return PC_OK;
+}
+
/* Parse the overload file. */
static parse_codes
parse_ovld ()
{
- return PC_OK;
+ parse_codes result = PC_OK;
+ diag = &ovld_diag;
+
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ while (result == PC_OK)
+ result = parse_ovld_stanza ();
+
+ if (result == PC_EOFILE)
+ return PC_OK;
+ return result;
}
/* Write everything to the header file (rs6000-builtins.h). */
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-06-25 16:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-15 17:17 [gcc(refs/users/wschmidt/heads/builtins10)] rs6000: Parsing of overload input file William Schmidt
-- strict thread matches above, loose matches on Subject: below --
2021-06-25 16:15 William Schmidt
2021-04-26 20:49 William Schmidt
2021-04-02 22:09 William Schmidt
2021-04-01 19:48 William Schmidt
2021-04-01 19:48 William Schmidt
2021-03-25 15:45 William Schmidt
2021-03-25 15:45 William Schmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).