* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "server/server.h"
-#include <helper/types.h>
#include "target/target.h"
#include "server/gdb_server.h"
#include "smp.h"
-
+#include "helper/binarybuffer.h"
/* implementation of new packet in gdb interface for smp feature */
/* */
/* Another way to test this packet is the usage of maintenance packet */
/* maint packet Jc01 */
/* maint packet jc */
-
-static const char DIGITS[16] = "0123456789abcdef";
-
/* packet j :smp status request */
int gdb_read_smp_packet(struct connection *connection,
- struct target *target, char *packet, int packet_size)
+ char const *packet, int packet_size)
{
- uint32_t len = sizeof(int32_t);
- uint8_t *buffer;
- char *hex_buffer;
+ struct target *target = get_target_from_connection(connection);
int retval = ERROR_OK;
- if (target->smp)
- {
- if (strstr(packet, "jc"))
- {
- hex_buffer = malloc(len * 2 + 1);
- buffer = (uint8_t *)&target->gdb_service->core[0];
- uint32_t i;
- for (i = 0; i < 4; i++)
- {
- uint8_t t = buffer[i];
- hex_buffer[2 * i] = DIGITS[(t >> 4) & 0xf];
- hex_buffer[2 * i + 1] = DIGITS[t & 0xf];
- }
-
- gdb_put_packet(connection, hex_buffer, len * 2);
-
- free(hex_buffer);
+ if (target->smp) {
+ if (strncmp(packet, "jc", 2) == 0) {
+ const uint32_t len = sizeof(target->gdb_service->core[0]);
+ char hex_buffer[len * 2 + 1];
+ uint8_t buffer[len];
+ buf_set_u32(buffer, 0, len * 8, target->gdb_service->core[0]);
+ size_t pkt_len = hexify(hex_buffer, buffer, sizeof(buffer),
+ sizeof(hex_buffer));
+
+ retval = gdb_put_packet(connection, hex_buffer, pkt_len);
}
- }
- else
- retval = gdb_put_packet(connection,"E01",3);
+ } else
+ retval = gdb_put_packet(connection, "E01", 3);
return retval;
}
/* J : smp set request */
int gdb_write_smp_packet(struct connection *connection,
- struct target *target, char *packet, int packet_size)
+ char const *packet, int packet_size)
{
+ struct target *target = get_target_from_connection(connection);
char *separator;
int coreid = 0;
+ int retval = ERROR_OK;
/* skip command character */
- if (target->smp)
- {
- if (strstr(packet, "Jc"))
- {
- packet+=2;
+ if (target->smp) {
+ if (strncmp(packet, "Jc", 2) == 0) {
+ packet += 2;
coreid = strtoul(packet, &separator, 16);
target->gdb_service->core[1] = coreid;
- gdb_put_packet(connection, "OK", 2);
+ retval = gdb_put_packet(connection, "OK", 2);
}
+ } else
+ retval = gdb_put_packet(connection, "E01", 3);
+
+ return retval;
+}
+
+COMMAND_HANDLER(default_handle_smp_command)
+{
+ struct target *target = get_current_target(CMD_CTX);
+ struct target_list *head;
+
+ if (CMD_ARGC > 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ if (!CMD_ARGC) {
+ command_print(CMD_CTX, "%s", target->smp ? "on" : "off");
+ return ERROR_OK;
}
- else
- {
- gdb_put_packet(connection,"E01",3);
+
+ if (!strcmp(CMD_ARGV[0], "on")) {
+ foreach_smp_target(head, target->head)
+ head->target->smp = 1;
+
+ return ERROR_OK;
+ }
+
+ if (!strcmp(CMD_ARGV[0], "off")) {
+ foreach_smp_target(head, target->head)
+ head->target->smp = 0;
+
+ /* fixes the target display to the debugger */
+ if (target->head)
+ target->gdb_service->target = target;
+
+ return ERROR_OK;
}
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
+}
+
+COMMAND_HANDLER(deprecated_handle_smp_on_command)
+{
+ const char *argv[] = {"on", NULL};
+
+ LOG_WARNING("\'smp_on\' is deprecated, please use \'smp on\' instead.");
+ CMD_ARGC = 1;
+ CMD_ARGV = argv;
+ return CALL_COMMAND_HANDLER(default_handle_smp_command);
}
+
+COMMAND_HANDLER(deprecated_handle_smp_off_command)
+{
+ const char *argv[] = {"off", NULL};
+
+ LOG_WARNING("\'smp_off\' is deprecated, please use \'smp off\' instead.");
+ CMD_ARGC = 1;
+ CMD_ARGV = argv;
+ return CALL_COMMAND_HANDLER(default_handle_smp_command);
+}
+
+const struct command_registration smp_command_handlers[] = {
+ {
+ .name = "smp",
+ .handler = default_handle_smp_command,
+ .mode = COMMAND_EXEC,
+ .help = "smp handling",
+ .usage = "[on|off]",
+ },
+ {
+ .name = "smp_on",
+ .handler = deprecated_handle_smp_on_command,
+ .mode = COMMAND_EXEC,
+ .help = "Restart smp handling",
+ .usage = "",
+ },
+ {
+ .name = "smp_off",
+ .handler = deprecated_handle_smp_off_command,
+ .mode = COMMAND_EXEC,
+ .help = "Stop smp handling",
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
Code Review / openocd.git / blobdiff