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

[openocd.git] / src / helper / replacements.c

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index f4ecb8dfcc5a719c48495e5ff1ad8ee8cfe30570..782d975184eaaab956e989345f1376f1f48b1edb 100644 (file)
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -7,24 +9,19 @@
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
  *   spen@spen-soft.co.uk                                                  *
- *                                                                         *
- *   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/>. *
  ***************************************************************************/
-/* DANGER!!!! These must be defined *BEFORE* replacements.h and the malloc() macro!!!! */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* define IN_REPLACEMENTS_C before include replacements.h */
+#define IN_REPLACEMENTS_C
+#include "replacements.h"
 
 #include <stdlib.h>
 #include <string.h>
+
 /*
  * clear_malloc
  *
@@ -33,7 +30,7 @@
 void *clear_malloc(size_t size)
 {
        void *t = malloc(size);
-       if (t != NULL)
+       if (t)
                memset(t, 0x00, size);
        return t;
 }
@@ -41,7 +38,7 @@ void *clear_malloc(size_t size)
 void *fill_malloc(size_t size)
 {
        void *t = malloc(size);
-       if (t != NULL) {
+       if (t) {
                /* We want to initialize memory to some known bad state.
                 * 0 and 0xff yields 0 and -1 as integers, which often
                 * have meaningful values. 0x5555... is not often a valid
@@ -52,10 +49,6 @@ void *fill_malloc(size_t size)
        return t;
 }
 
-#define IN_REPLACEMENTS_C
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -124,7 +117,7 @@ char *strndup(const char *s, size_t n)
        size_t len = strnlen(s, n);
        char *new = malloc(len + 1);
 
-       if (new == NULL)
+       if (!new)
                return NULL;
 
        new[len] = '\0';
@@ -145,10 +138,10 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
        struct timeval tvslice;
        int retcode;
 
-#define SAFE_FD_ISSET(fd, set)  (set != NULL && FD_ISSET(fd, set))
+#define SAFE_FD_ISSET(fd, set)  (set && FD_ISSET(fd, set))
 
        /* calculate how long we need to wait in milliseconds */
-       if (tv == NULL)
+       if (!tv)
                ms_total = INFINITE;
        else {
                ms_total = tv->tv_sec * 1000;
@@ -233,16 +226,16 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
                                if (retcode < 0)
                                        retcode = 0;
                                for (i = 0; i < n_handles; i++) {
-                                       if (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) {
+                                       if (WaitForSingleObject(handles[i], 0) == WAIT_OBJECT_0) {
                                                if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {
-                                                       DWORD dwBytes;
+                                                       DWORD bytes;
                                                        intptr_t handle = (intptr_t) _get_osfhandle(
                                                                        handle_slot_to_fd[i]);
 
                                                        if (PeekNamedPipe((HANDLE)handle, NULL, 0,
-                                                                   NULL, &dwBytes, NULL)) {
+                                                                   NULL, &bytes, NULL)) {
                                                                /* check to see if gdb pipe has data available */
-                                                               if (dwBytes) {
+                                                               if (bytes) {
                                                                        FD_SET(handle_slot_to_fd[i], &aread);
                                                                        retcode++;
                                                                }
@@ -275,45 +268,3 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
        return retcode;
 }
 #endif
-
-#if defined HAVE_LIBUSB1 && !defined HAVE_LIBUSB_ERROR_NAME
-#include <libusb.h>
-/* Verbatim from git://git.libusb.org/libusb.git tag 1.0.9
- * The libusb_error enum is compatible down to v0.9.1
- */
-const char *libusb_error_name(int error_code)
-{
-       enum libusb_error error = error_code;
-       switch (error) {
-       case LIBUSB_SUCCESS:
-               return "LIBUSB_SUCCESS";
-       case LIBUSB_ERROR_IO:
-               return "LIBUSB_ERROR_IO";
-       case LIBUSB_ERROR_INVALID_PARAM:
-               return "LIBUSB_ERROR_INVALID_PARAM";
-       case LIBUSB_ERROR_ACCESS:
-               return "LIBUSB_ERROR_ACCESS";
-       case LIBUSB_ERROR_NO_DEVICE:
-               return "LIBUSB_ERROR_NO_DEVICE";
-       case LIBUSB_ERROR_NOT_FOUND:
-               return "LIBUSB_ERROR_NOT_FOUND";
-       case LIBUSB_ERROR_BUSY:
-               return "LIBUSB_ERROR_BUSY";
-       case LIBUSB_ERROR_TIMEOUT:
-               return "LIBUSB_ERROR_TIMEOUT";
-       case LIBUSB_ERROR_OVERFLOW:
-               return "LIBUSB_ERROR_OVERFLOW";
-       case LIBUSB_ERROR_PIPE:
-               return "LIBUSB_ERROR_PIPE";
-       case LIBUSB_ERROR_INTERRUPTED:
-               return "LIBUSB_ERROR_INTERRUPTED";
-       case LIBUSB_ERROR_NO_MEM:
-               return "LIBUSB_ERROR_NO_MEM";
-       case LIBUSB_ERROR_NOT_SUPPORTED:
-               return "LIBUSB_ERROR_NOT_SUPPORTED";
-       case LIBUSB_ERROR_OTHER:
-               return "LIBUSB_ERROR_OTHER";
-       }
-       return "**UNKNOWN**";
-}
-#endif