target/armv7m: fix static analyzer warning

[fw/openocd] / src / target / smp.c

diff --git a/src/target/smp.c b/src/target/smp.c
index 39a95337d3bb1fa86d960f0d7755be3bf588623d..6501dc08a790982cb5c88a2c6536e9f38187014f 100644 (file)
--- a/src/target/smp.c
+++ b/src/target/smp.c
@@ -13,9 +13,7 @@
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -56,21 +54,20 @@
 
 /* packet j :smp status request */
 int gdb_read_smp_packet(struct connection *connection,
-               char *packet, int packet_size)
+               char const *packet, int packet_size)
 {
        struct target *target = get_target_from_connection(connection);
-       uint32_t len = sizeof(int32_t);
-       uint8_t *buffer;
-       char *hex_buffer;
        int retval = ERROR_OK;
        if (target->smp) {
                if (strncmp(packet, "jc", 2) == 0) {
-                       hex_buffer = malloc(len * 2 + 1);
-                       buffer = (uint8_t *)&target->gdb_service->core[0];
-                       int pkt_len = hexify(hex_buffer, (char *)buffer, len, len * 2 + 1);
+                       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);
-                       free(hex_buffer);
                }
        } else
                retval = gdb_put_packet(connection, "E01", 3);
@@ -79,7 +76,7 @@ int gdb_read_smp_packet(struct connection *connection,
 
 /* J :  smp set request */
 int gdb_write_smp_packet(struct connection *connection,
-               char *packet, int packet_size)
+               char const *packet, int packet_size)
 {
        struct target *target = get_target_from_connection(connection);
        char *separator;
@@ -99,3 +96,76 @@ int gdb_write_smp_packet(struct connection *connection,
 
        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, "%s", target->smp ? "on" : "off");
+               return ERROR_OK;
+       }
+
+       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_COMMAND_SYNTAX_ERROR;
+}
+
+COMMAND_HANDLER(handle_smp_gdb_command)
+{
+       struct target *target = get_current_target(CMD_CTX);
+       int retval = ERROR_OK;
+       struct target_list *head;
+       head = target->head;
+       if (head != (struct target_list *)NULL) {
+               if (CMD_ARGC == 1) {
+                       int coreid = 0;
+                       COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
+                       if (ERROR_OK != retval)
+                               return retval;
+                       target->gdb_service->core[1] = coreid;
+
+               }
+               command_print(CMD, "gdb coreid  %" PRId32 " -> %" PRId32, target->gdb_service->core[0]
+                       , target->gdb_service->core[1]);
+       }
+       return ERROR_OK;
+}
+
+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_gdb",
+               .handler = handle_smp_gdb_command,
+               .mode = COMMAND_EXEC,
+               .help = "display/fix current core played to gdb",
+               .usage = "",
+       },
+       COMMAND_REGISTRATION_DONE
+};