target/xtensa: avoid IHI for writes to non-executable memory

[openocd.git] / src / rtos / mqx.c

diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c
index f6be35b6cc57ed6aa2f5b70b854c9bbd543ea3f5..d9b694282ae1db43fa2a7b56d76d46e4c57b23e5 100644 (file)
--- a/src/rtos/mqx.c
+++ b/src/rtos/mqx.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2014 by Marian Cingel                                   *
  *   cingel.marian@gmail.com                                               *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -243,7 +232,7 @@ static bool mqx_detect_rtos(
 )
 {
        if (
-               (target->rtos->symbols != NULL) &&
+               (target->rtos->symbols) &&
                (target->rtos->symbols[MQX_VAL_MQX_KERNEL_DATA].address != 0)
        ) {
                return true;
@@ -260,7 +249,7 @@ static int mqx_create(
 {
        /* check target name against supported architectures */
        for (unsigned int i = 0; i < ARRAY_SIZE(mqx_params_list); i++) {
-               if (0 == strcmp(mqx_params_list[i].target_name, target->type->name)) {
+               if (strcmp(mqx_params_list[i].target_name, target->type->name) == 0) {
                        target->rtos->rtos_specific_params = (void *)&mqx_params_list[i];
                        /* LOG_DEBUG("MQX RTOS - valid architecture: %s", target->type->name); */
                        return 0;
@@ -291,7 +280,7 @@ static int mqx_update_threads(
        /* clear old data */
        rtos_free_threadlist(rtos);
        /* check scheduler */
-       if (ERROR_OK != mqx_is_scheduler_running(rtos))
+       if (mqx_is_scheduler_running(rtos) != ERROR_OK)
                return ERROR_FAIL;
        /* get kernel_data symbol */
        if (mqx_get_symbol(rtos, MQX_VAL_MQX_KERNEL_DATA, &kernel_data_addr) != ERROR_OK)
@@ -393,7 +382,7 @@ static int mqx_update_threads(
                rtos->thread_details[i].exists = true;
                /* set thread name */
                rtos->thread_details[i].thread_name_str = malloc(strlen((void *)task_name) + 1);
-               if (NULL == rtos->thread_details[i].thread_name_str)
+               if (!rtos->thread_details[i].thread_name_str)
                        return ERROR_FAIL;
                strcpy(rtos->thread_details[i].thread_name_str, (void *)task_name);
                /* set thread extra info
@@ -405,7 +394,7 @@ static int mqx_update_threads(
                 */
                extra_info_length += strlen((void *)state_name) + 7 + 13 + 8 + 15 + 8;
                rtos->thread_details[i].extra_info_str = malloc(extra_info_length + 1);
-               if (NULL == rtos->thread_details[i].extra_info_str)
+               if (!rtos->thread_details[i].extra_info_str)
                        return ERROR_FAIL;
                snprintf(rtos->thread_details[i].extra_info_str, extra_info_length,
                         "State: %s, Address: 0x%" PRIx32 ",  Error Code: %" PRIu32,
@@ -438,7 +427,7 @@ static int mqx_get_thread_reg_list(
                LOG_ERROR("MQX RTOS - invalid threadid: 0x%X", (int)thread_id);
                return ERROR_FAIL;
        }
-       if (ERROR_OK != mqx_is_scheduler_running(rtos))
+       if (mqx_is_scheduler_running(rtos) != ERROR_OK)
                return ERROR_FAIL;
        /* get kernel_data symbol */
        if (mqx_get_symbol(rtos, MQX_VAL_MQX_KERNEL_DATA, &kernel_data_addr) != ERROR_OK)
@@ -501,7 +490,7 @@ static int mqx_get_thread_reg_list(
 static int mqx_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[])
 {
        *symbol_list = calloc(ARRAY_SIZE(mqx_symbol_list), sizeof(struct symbol_table_elem));
-       if (NULL == *symbol_list)
+       if (!*symbol_list)
                return ERROR_FAIL;
        /* export required symbols */
        for (int i = 0; i < (int)(ARRAY_SIZE(mqx_symbol_list)); i++)
@@ -509,7 +498,7 @@ static int mqx_get_symbol_list_to_lookup(struct symbol_table_elem *symbol_list[]
        return ERROR_OK;
 }
 
-struct rtos_type mqx_rtos = {
+const struct rtos_type mqx_rtos = {
        .name = "mqx",
        .detect_rtos = mqx_detect_rtos,
        .create = mqx_create,