public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/wschmidt/heads/builtins4)] rs6000: Parsing of overload input file
@ 2020-11-24 16:43 William Schmidt
0 siblings, 0 replies; 4+ messages in thread
From: William Schmidt @ 2020-11-24 16:43 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:f759f6b91e2d359d4c5fc9d3701e41f052a0f070
commit f759f6b91e2d359d4c5fc9d3701e41f052a0f070
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Sun Nov 1 19:30:01 2020 -0500
rs6000: Parsing of overload input file
2020-11-01 Bill Schmidt <wschmidt@linux.ibm.com>
* 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.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 230 +++++++++++++++++++++++++++++++-
1 file changed, 229 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 0d8851452dd..37612fe8d71 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -380,8 +380,32 @@ static bifdata bifs[MAXBIFS];
static int num_bifs;
static int curr_bif;
+/* 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 256
+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;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1519,11 +1543,215 @@ parse_bif ()
return result;
}
+/* 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;
+
+ /* 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 when we use opaque
+ vector parameter and return types, 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] 4+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins4)] rs6000: Parsing of overload input file
@ 2021-02-07 18:12 William Schmidt
0 siblings, 0 replies; 4+ messages in thread
From: William Schmidt @ 2021-02-07 18:12 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:78d9a6353d058d7f1f586f6ddf09ce06a10920c3
commit 78d9a6353d058d7f1f586f6ddf09ce06a10920c3
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Sun Nov 1 19:30:01 2020 -0500
rs6000: Parsing of overload input file
2020-11-01 Bill Schmidt <wschmidt@linux.ibm.com>
* 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.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 230 +++++++++++++++++++++++++++++++-
1 file changed, 229 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 0d8851452dd..37612fe8d71 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -380,8 +380,32 @@ static bifdata bifs[MAXBIFS];
static int num_bifs;
static int curr_bif;
+/* 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 256
+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;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1519,11 +1543,215 @@ parse_bif ()
return result;
}
+/* 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;
+
+ /* 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 when we use opaque
+ vector parameter and return types, 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] 4+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins4)] rs6000: Parsing of overload input file
@ 2020-12-16 18:05 William Schmidt
0 siblings, 0 replies; 4+ messages in thread
From: William Schmidt @ 2020-12-16 18:05 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:f81b612050aa7d2390d7b8b042901168f2a03a72
commit f81b612050aa7d2390d7b8b042901168f2a03a72
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Sun Nov 1 19:30:01 2020 -0500
rs6000: Parsing of overload input file
2020-11-01 Bill Schmidt <wschmidt@linux.ibm.com>
* 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.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 230 +++++++++++++++++++++++++++++++-
1 file changed, 229 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 0d8851452dd..37612fe8d71 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -380,8 +380,32 @@ static bifdata bifs[MAXBIFS];
static int num_bifs;
static int curr_bif;
+/* 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 256
+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;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1519,11 +1543,215 @@ parse_bif ()
return result;
}
+/* 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;
+
+ /* 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 when we use opaque
+ vector parameter and return types, 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] 4+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins4)] rs6000: Parsing of overload input file
@ 2020-11-02 0:30 William Schmidt
0 siblings, 0 replies; 4+ messages in thread
From: William Schmidt @ 2020-11-02 0:30 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:5f34d515e5bc5982f27949773236030c6d2f5c49
commit 5f34d515e5bc5982f27949773236030c6d2f5c49
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Sun Nov 1 19:30:01 2020 -0500
rs6000: Parsing of overload input file
2020-11-01 Bill Schmidt <wschmidt@linux.ibm.com>
* 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.
(parse_ovld_entry): New function.
(parse_ovld_stanza): Likewise.
(parse_ovld): Implement.
Diff:
---
gcc/config/rs6000/rs6000-gen-builtins.c | 230 +++++++++++++++++++++++++++++++-
1 file changed, 229 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 0d8851452dd..37612fe8d71 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -380,8 +380,32 @@ static bifdata bifs[MAXBIFS];
static int num_bifs;
static int curr_bif;
+/* 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 256
+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;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1519,11 +1543,215 @@ parse_bif ()
return result;
}
+/* 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;
+
+ /* 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 when we use opaque
+ vector parameter and return types, 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] 4+ messages in thread
end of thread, other threads:[~2021-02-07 18:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 16:43 [gcc(refs/users/wschmidt/heads/builtins4)] rs6000: Parsing of overload input file William Schmidt
-- strict thread matches above, loose matches on Subject: below --
2021-02-07 18:12 William Schmidt
2020-12-16 18:05 William Schmidt
2020-11-02 0:30 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).