|
@@ -836,7 +836,7 @@ static inline int startswith(const char *string, const char *pattern)
|
|
return !strncmp(string, pattern, strlen(pattern));
|
|
return !strncmp(string, pattern, strlen(pattern));
|
|
}
|
|
}
|
|
|
|
|
|
-static int process_string_cmd(void *user_ctx, const char *data,
|
|
|
|
|
|
+static int process_string_cmd(const char *data,
|
|
const GdbCmdParseEntry *cmds, int num_cmds)
|
|
const GdbCmdParseEntry *cmds, int num_cmds)
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
@@ -863,7 +863,7 @@ static int process_string_cmd(void *user_ctx, const char *data,
|
|
}
|
|
}
|
|
|
|
|
|
gdbserver_state.allow_stop_reply = cmd->allow_stop_reply;
|
|
gdbserver_state.allow_stop_reply = cmd->allow_stop_reply;
|
|
- cmd->handler(params, user_ctx);
|
|
|
|
|
|
+ cmd->handler(params, NULL);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -881,7 +881,7 @@ static void run_cmd_parser(const char *data, const GdbCmdParseEntry *cmd)
|
|
|
|
|
|
/* In case there was an error during the command parsing we must
|
|
/* In case there was an error during the command parsing we must
|
|
* send a NULL packet to indicate the command is not supported */
|
|
* send a NULL packet to indicate the command is not supported */
|
|
- if (process_string_cmd(NULL, data, cmd, 1)) {
|
|
|
|
|
|
+ if (process_string_cmd(data, cmd, 1)) {
|
|
gdb_put_packet("");
|
|
gdb_put_packet("");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1394,7 +1394,7 @@ static void handle_v_commands(GArray *params, void *user_ctx)
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (process_string_cmd(NULL, get_param(params, 0)->data,
|
|
|
|
|
|
+ if (process_string_cmd(get_param(params, 0)->data,
|
|
gdb_v_commands_table,
|
|
gdb_v_commands_table,
|
|
ARRAY_SIZE(gdb_v_commands_table))) {
|
|
ARRAY_SIZE(gdb_v_commands_table))) {
|
|
gdb_put_packet("");
|
|
gdb_put_packet("");
|
|
@@ -1738,13 +1738,13 @@ static void handle_gen_query(GArray *params, void *user_ctx)
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (!process_string_cmd(NULL, get_param(params, 0)->data,
|
|
|
|
|
|
+ if (!process_string_cmd(get_param(params, 0)->data,
|
|
gdb_gen_query_set_common_table,
|
|
gdb_gen_query_set_common_table,
|
|
ARRAY_SIZE(gdb_gen_query_set_common_table))) {
|
|
ARRAY_SIZE(gdb_gen_query_set_common_table))) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (process_string_cmd(NULL, get_param(params, 0)->data,
|
|
|
|
|
|
+ if (process_string_cmd(get_param(params, 0)->data,
|
|
gdb_gen_query_table,
|
|
gdb_gen_query_table,
|
|
ARRAY_SIZE(gdb_gen_query_table))) {
|
|
ARRAY_SIZE(gdb_gen_query_table))) {
|
|
gdb_put_packet("");
|
|
gdb_put_packet("");
|
|
@@ -1757,13 +1757,13 @@ static void handle_gen_set(GArray *params, void *user_ctx)
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (!process_string_cmd(NULL, get_param(params, 0)->data,
|
|
|
|
|
|
+ if (!process_string_cmd(get_param(params, 0)->data,
|
|
gdb_gen_query_set_common_table,
|
|
gdb_gen_query_set_common_table,
|
|
ARRAY_SIZE(gdb_gen_query_set_common_table))) {
|
|
ARRAY_SIZE(gdb_gen_query_set_common_table))) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (process_string_cmd(NULL, get_param(params, 0)->data,
|
|
|
|
|
|
+ if (process_string_cmd(get_param(params, 0)->data,
|
|
gdb_gen_set_table,
|
|
gdb_gen_set_table,
|
|
ARRAY_SIZE(gdb_gen_set_table))) {
|
|
ARRAY_SIZE(gdb_gen_set_table))) {
|
|
gdb_put_packet("");
|
|
gdb_put_packet("");
|