aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog2
-rw-r--r--gdb/reply_mig_hack.awk8
2 files changed, 9 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 093686f..4bca7d6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
2015-04-20 Thomas Schwinge <thomas@codesourcery.com>
+ * reply_mig_hack.awk: Robustify parsing.
+
* reply_mig_hack.awk: Don't bother to declare an intermediate
function pointer variable.
diff --git a/gdb/reply_mig_hack.awk b/gdb/reply_mig_hack.awk
index 7eab504..b731115 100644
--- a/gdb/reply_mig_hack.awk
+++ b/gdb/reply_mig_hack.awk
@@ -49,7 +49,7 @@ parse_phase == 2 {
print; next;
}
-parse_phase == 3 && /}/ {
+parse_phase == 3 && /} Request/ {
# The args structure is over.
if (num_args > 1)
parse_phase = 5;
@@ -62,6 +62,9 @@ parse_phase == 3 && /}/ {
parse_phase == 3 && num_args == 0 {
# The type field for an argument.
+ # This won't be accurate in case of unions being used in the Request struct,
+ # but that doesn't matter, as we'll only be looking at arg_type_code_name[0],
+ # which will not be a union type.
arg_type_code_name[num_args] = $2;
sub (/;$/, "", arg_type_code_name[num_args]) # Get rid of the semi-colon
parse_phase = 4;
@@ -82,6 +85,9 @@ parse_phase == 3 {
parse_phase == 4 {
# The value field for an argument.
+ # This won't be accurate in case of unions being used in the Request struct,
+ # but that doesn't matter, as we'll only be looking at arg_name[0], which
+ # will not be a union type.
arg_name[num_args] = $2;
sub (/;$/, "", arg_name[num_args]) # Get rid of the semi-colon
num_args++;