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

[openocd.git] / src / target / riscv / riscv_semihosting.c

diff --git a/src/target/riscv/riscv_semihosting.c b/src/target/riscv/riscv_semihosting.c
index 03de97c457fdd63d84fef824f0a90813bfe730d8..da237ef337525ea7a4080a4bed2bbbaf95a43f6d 100644 (file)
--- a/src/target/riscv/riscv_semihosting.c
+++ b/src/target/riscv/riscv_semihosting.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /***************************************************************************
  *   Copyright (C) 2018 by Liviu Ionescu                                   *
@@ -141,16 +141,16 @@ enum semihosting_result riscv_semihosting(struct target *target, int *retval)
                }
        }
 
+       /* Resume right after the EBREAK 4 bytes instruction. */
+       *retval = riscv_set_register(target, GDB_REGNO_PC, pc + 4);
+       if (*retval != ERROR_OK)
+               return SEMIHOSTING_ERROR;
+
        /*
         * Resume target if we are not waiting on a fileio
         * operation to complete.
         */
        if (semihosting->is_resumable && !semihosting->hit_fileio) {
-               /* Resume right after the EBREAK 4 bytes instruction. */
-               *retval = riscv_set_register(target, GDB_REGNO_PC, pc + 4);
-               if (*retval != ERROR_OK)
-                       return SEMIHOSTING_ERROR;
-
                LOG_DEBUG("   -> HANDLED");
                return SEMIHOSTING_HANDLED;
        }