public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-09-14 13:57 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-09-14 13:57 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:b67bedebc08b3fead5a5f07d64b2bfccf6b08a02
commit b67bedebc08b3fead5a5f07d64b2bfccf6b08a02
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-07-26 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 | 202 +++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index c4bc5c724a3..5413cc2681e 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -360,8 +360,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1460,11 +1483,188 @@ 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. */
+ 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].idname = 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;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ 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;
+ }
+
+ 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;
+ while (result == PC_OK)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ /* Parse a stanza beginning at this line. */
+ 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] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-10-29 19:50 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-10-29 19:50 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:bd3dab350dc5cd25b51c7c51761a90240ccec3a1
commit bd3dab350dc5cd25b51c7c51761a90240ccec3a1
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-07-26 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 | 202 +++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index c4bc5c724a3..5413cc2681e 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -360,8 +360,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1460,11 +1483,188 @@ 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. */
+ 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].idname = 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;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ 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;
+ }
+
+ 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;
+ while (result == PC_OK)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ /* Parse a stanza beginning at this line. */
+ 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] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-10-27 16:28 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-10-27 16:28 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:e3651e08fa908b72735bed191159b1c5525c65e3
commit e3651e08fa908b72735bed191159b1c5525c65e3
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-07-26 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 | 202 +++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index c4bc5c724a3..5413cc2681e 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -360,8 +360,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1460,11 +1483,188 @@ 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. */
+ 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].idname = 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;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ 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;
+ }
+
+ 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;
+ while (result == PC_OK)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ /* Parse a stanza beginning at this line. */
+ 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] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-09-16 21:29 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-09-16 21:29 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:8ba58174921386d67fa55a50fff6d1a6b7349252
commit 8ba58174921386d67fa55a50fff6d1a6b7349252
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-07-26 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 | 202 +++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index c4bc5c724a3..5413cc2681e 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -360,8 +360,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1460,11 +1483,188 @@ 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. */
+ 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].idname = 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;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ 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;
+ }
+
+ 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;
+ while (result == PC_OK)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ /* Parse a stanza beginning at this line. */
+ 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] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-08-28 20:07 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-08-28 20:07 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:ede37d3817c1bff945ef8b744ef3a96cb1762334
commit ede37d3817c1bff945ef8b744ef3a96cb1762334
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-07-26 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 | 202 +++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index c4bc5c724a3..5413cc2681e 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -360,8 +360,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1460,11 +1483,188 @@ 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. */
+ 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].idname = 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;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ 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;
+ }
+
+ 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;
+ while (result == PC_OK)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ /* Parse a stanza beginning at this line. */
+ 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] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-08-20 16:38 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-08-20 16:38 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:f0ed3e6007fc6c3385c4c13a3663e0f9792ed76d
commit f0ed3e6007fc6c3385c4c13a3663e0f9792ed76d
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-07-26 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 | 202 +++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index c4bc5c724a3..5413cc2681e 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -360,8 +360,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1460,11 +1483,188 @@ 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. */
+ 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].idname = 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;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ 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;
+ }
+
+ 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;
+ while (result == PC_OK)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ /* Parse a stanza beginning at this line. */
+ 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] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-08-18 18:44 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-08-18 18:44 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:59312ca9a5465329f3068bbba8eaa40b7bcd7dc2
commit 59312ca9a5465329f3068bbba8eaa40b7bcd7dc2
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-07-26 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 | 202 +++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index c4bc5c724a3..5413cc2681e 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -360,8 +360,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1460,11 +1483,188 @@ 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. */
+ 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].idname = 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;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ 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;
+ }
+
+ 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;
+ while (result == PC_OK)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ /* Parse a stanza beginning at this line. */
+ 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] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-07-27 18:47 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-07-27 18:47 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:979e9133d5b3e0e7e5c37a3d820ba9e07a8fd48f
commit 979e9133d5b3e0e7e5c37a3d820ba9e07a8fd48f
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-07-26 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 | 202 +++++++++++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index c4bc5c724a3..5413cc2681e 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -360,8 +360,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1460,11 +1483,188 @@ 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. */
+ 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].idname = 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;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return PC_PARSEFAIL;
+ }
+
+ consume_whitespace ();
+ 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;
+ }
+
+ 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;
+ while (result == PC_OK)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return PC_OK;
+
+ /* Parse a stanza beginning at this line. */
+ 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] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-07-17 17:22 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-07-17 17:22 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:f9f993b94f8c371e2264ad3a4008c65088e3f1e2
commit f9f993b94f8c371e2264ad3a4008c65088e3f1e2
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-06-17 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 | 206 +++++++++++++++++++++++++++++++-
1 file changed, 205 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 31661f0f39a..c872c9e0a10 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -292,8 +292,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1390,11 +1413,192 @@ parse_bif ()
return result;
}
+/* Parse one two-line entry in the overload file. Return 0 for EOF, 1 for
+ success, 2 for end-of-stanza, and 6 for a parsing failure. */
+static int
+parse_ovld_entry ()
+{
+ /* Check for end of stanza. */
+ pos = 0;
+ consume_whitespace ();
+ if (linebuf[pos] == '[')
+ return 2;
+
+ /* Allocate an entry in the overload table. */
+ if (num_ovlds >= MAXOVLDS - 1)
+ {
+ (*diag) ("too many overloads.\n");
+ return 6;
+ }
+
+ curr_ovld = num_ovlds++;
+ ovlds[curr_ovld].stanza = curr_ovld_stanza;
+
+ if (!parse_prototype (&ovlds[curr_ovld].proto))
+ return 6;
+
+ /* Now process line 2, which just contains the builtin id. */
+ if (!advance_line (ovld_file))
+ {
+ (*diag) ("unexpected EOF.\n");
+ return 0;
+ }
+
+ pos = 0;
+ consume_whitespace ();
+ int oldpos = pos;
+ char *id = match_identifier ();
+ ovlds[curr_ovld].idname = id;
+ if (!id)
+ {
+ (*diag) ("missing overload id at column %d.\n", pos + 1);
+ return 6;
+ }
+
+#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 6;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return 6;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n')
+ {
+ (*diag) ("garbage at end of line at column %d.\n", pos + 1);
+ return 6;
+ }
+ return 1;
+}
+
+/* Parse one stanza of the input overload file. linebuf already contains the
+ first line to parse. Return 1 for success, 0 for EOF, 6 for failure. */
+static int
+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 6;
+ }
+ safe_inc_pos ();
+
+ char *stanza_name = match_identifier ();
+ if (!stanza_name)
+ {
+ (*diag) ("no identifier found in stanza header.\n");
+ return 6;
+ }
+
+ /* 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 6;
+ }
+
+ 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 6;
+ }
+ 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 6;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return 6;
+ }
+ 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 6;
+ }
+
+ if (linebuf[pos] != ']')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return 6;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n' && pos != LINELEN - 1)
+ {
+ (*diag) ("garbage after stanza header.\n");
+ return 6;
+ }
+
+ int result = 1;
+
+ while (result != 2) /* end of stanza */
+ {
+ int result;
+ if (!advance_line (ovld_file))
+ return 0;
+
+ result = parse_ovld_entry ();
+ if (!result) /* EOF */
+ return 0;
+ else if (result > 2)
+ return 6;
+ }
+
+ return 1;
+}
+
/* Parse the overload file. Return 1 for success, 6 for a parsing error. */
static int
parse_ovld ()
{
- return 1;
+ int result = 1;
+ diag = &ovld_diag;
+ while (result == 1)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return 1;
+
+ /* Parse a stanza beginning at this line. */
+ result = parse_ovld_stanza ();
+ }
+ if (result == 0)
+ return 1;
+ return result;
}
/* Write everything to the header file (rs6000-builtins.h). */
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file
@ 2020-06-17 20:05 William Schmidt
0 siblings, 0 replies; 10+ messages in thread
From: William Schmidt @ 2020-06-17 20:05 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:ce47e5872d419a859d1561fc9307281a9144f094
commit ce47e5872d419a859d1561fc9307281a9144f094
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Wed Jun 17 11:03:28 2020 -0500
rs6000: Parsing of overload input file
2020-06-17 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 | 206 +++++++++++++++++++++++++++++++-
1 file changed, 205 insertions(+), 1 deletion(-)
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index 31661f0f39a..c872c9e0a10 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -292,8 +292,31 @@ struct bifdata {
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;
+};
+
+#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 *idname;
+ char *fndecl;
+};
+
+static ovlddata ovlds[MAXOVLDS];
static int num_ovlds;
+static int curr_ovld;
/* Exit codes for the shell. */
enum exit_codes {
@@ -1390,11 +1413,192 @@ parse_bif ()
return result;
}
+/* Parse one two-line entry in the overload file. Return 0 for EOF, 1 for
+ success, 2 for end-of-stanza, and 6 for a parsing failure. */
+static int
+parse_ovld_entry ()
+{
+ /* Check for end of stanza. */
+ pos = 0;
+ consume_whitespace ();
+ if (linebuf[pos] == '[')
+ return 2;
+
+ /* Allocate an entry in the overload table. */
+ if (num_ovlds >= MAXOVLDS - 1)
+ {
+ (*diag) ("too many overloads.\n");
+ return 6;
+ }
+
+ curr_ovld = num_ovlds++;
+ ovlds[curr_ovld].stanza = curr_ovld_stanza;
+
+ if (!parse_prototype (&ovlds[curr_ovld].proto))
+ return 6;
+
+ /* Now process line 2, which just contains the builtin id. */
+ if (!advance_line (ovld_file))
+ {
+ (*diag) ("unexpected EOF.\n");
+ return 0;
+ }
+
+ pos = 0;
+ consume_whitespace ();
+ int oldpos = pos;
+ char *id = match_identifier ();
+ ovlds[curr_ovld].idname = id;
+ if (!id)
+ {
+ (*diag) ("missing overload id at column %d.\n", pos + 1);
+ return 6;
+ }
+
+#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 6;
+ }
+
+ /* Save the ID in a lookup structure. */
+ if (!rbt_insert (&ovld_rbt, id))
+ {
+ (*diag) ("duplicate function ID '%s' at column %d.\n", id, oldpos + 1);
+ return 6;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n')
+ {
+ (*diag) ("garbage at end of line at column %d.\n", pos + 1);
+ return 6;
+ }
+ return 1;
+}
+
+/* Parse one stanza of the input overload file. linebuf already contains the
+ first line to parse. Return 1 for success, 0 for EOF, 6 for failure. */
+static int
+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 6;
+ }
+ safe_inc_pos ();
+
+ char *stanza_name = match_identifier ();
+ if (!stanza_name)
+ {
+ (*diag) ("no identifier found in stanza header.\n");
+ return 6;
+ }
+
+ /* 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 6;
+ }
+
+ 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 6;
+ }
+ 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 6;
+ }
+
+ consume_whitespace ();
+ if (linebuf[pos] != ',')
+ {
+ (*diag) ("missing comma at column %d.\n", pos + 1);
+ return 6;
+ }
+ 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 6;
+ }
+
+ if (linebuf[pos] != ']')
+ {
+ (*diag) ("ill-formed stanza header at column %d.\n", pos + 1);
+ return 6;
+ }
+ safe_inc_pos ();
+
+ consume_whitespace ();
+ if (linebuf[pos] != '\n' && pos != LINELEN - 1)
+ {
+ (*diag) ("garbage after stanza header.\n");
+ return 6;
+ }
+
+ int result = 1;
+
+ while (result != 2) /* end of stanza */
+ {
+ int result;
+ if (!advance_line (ovld_file))
+ return 0;
+
+ result = parse_ovld_entry ();
+ if (!result) /* EOF */
+ return 0;
+ else if (result > 2)
+ return 6;
+ }
+
+ return 1;
+}
+
/* Parse the overload file. Return 1 for success, 6 for a parsing error. */
static int
parse_ovld ()
{
- return 1;
+ int result = 1;
+ diag = &ovld_diag;
+ while (result == 1)
+ {
+ /* Read ahead one line and check for EOF. */
+ if (!advance_line (ovld_file))
+ return 1;
+
+ /* Parse a stanza beginning at this line. */
+ result = parse_ovld_stanza ();
+ }
+ if (result == 0)
+ return 1;
+ return result;
}
/* Write everything to the header file (rs6000-builtins.h). */
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-10-29 19:50 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-14 13:57 [gcc(refs/users/wschmidt/heads/builtins3)] rs6000: Parsing of overload input file William Schmidt
-- strict thread matches above, loose matches on Subject: below --
2020-10-29 19:50 William Schmidt
2020-10-27 16:28 William Schmidt
2020-09-16 21:29 William Schmidt
2020-08-28 20:07 William Schmidt
2020-08-20 16:38 William Schmidt
2020-08-18 18:44 William Schmidt
2020-07-27 18:47 William Schmidt
2020-07-17 17:22 William Schmidt
2020-06-17 20:05 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).