Fix: semihosting cleanup

src/gdb_main.c

@@ -280,7 +280,7 @@ int gdb_main_loop(target_controller_s *tc, char *pbuf, size_t pbuf_size, size_t
 #if PC_HOSTED == 0
 	case 'F': /* Semihosting call finished */
 		if (in_syscall)
-			return hostio_reply(tc, pbuf, size);
+			return semihosting_reply(tc, pbuf, size);
 		else {
 			DEBUG_GDB("*** F packet when not in syscall! '%s'\n", pbuf);
 			gdb_putpacketz("");

src/include/buffer_utils.h

@@ -68,4 +68,12 @@ static inline uint32_t read_be4(const uint8_t *const buffer, const size_t offset
 		((uint32_t)buffer[offset + 2U] << 8U) | buffer[offset + 3U];
 }
 
+static inline uint64_t read_be8(const uint8_t *const buffer, const size_t offset)
+{
+	return ((uint64_t)buffer[offset + 0] << 56U) | ((uint64_t)buffer[offset + 1] << 48U) |
+		((uint64_t)buffer[offset + 2] << 40U) | ((uint64_t)buffer[offset + 3] << 32U) |
+		((uint64_t)buffer[offset + 4] << 24U) | ((uint64_t)buffer[offset + 5] << 16U) |
+		((uint64_t)buffer[offset + 6] << 8U) | buffer[offset + 7];
+}
+
 #endif /*INCLUDE_BUFFER_UTILS_H*/

src/include/target.h

@@ -165,7 +165,7 @@ struct target_controller {
 	void (*destroy_callback)(target_controller_s *, target_s *target);
 	void (*printf)(target_controller_s *, const char *fmt, va_list);
 
-	target_errno_e errno_;
+	target_errno_e gdb_errno;
 	bool interrupted;
 };
 

src/target/cortexm.c

@@ -78,6 +78,8 @@ static int cortexm_breakwatch_set(target_s *target, breakwatch_s *breakwatch);
 static int cortexm_breakwatch_clear(target_s *target, breakwatch_s *breakwatch);
 static target_addr_t cortexm_check_watch(target_s *target);
 
+static bool cortexm_hostio_request(target_s *const target);
+
 typedef struct cortexm_priv {
 	cortex_priv_s base;
 	bool stepping;
@@ -1368,3 +1370,20 @@ static bool cortexm_redirect_stdout(target_s *target, int argc, const char **arg
 	return true;
 }
 #endif
+
+static bool cortexm_hostio_request(target_s *const target)
+{
+	/* Read out the information from the target needed to complete the request */
+	uint32_t syscall = 0U;
+	target_reg_read(target, 0, &syscall, sizeof(syscall));
+	uint32_t r1 = 0U;
+	target_reg_read(target, 1, &r1, sizeof(r1));
+
+	/* Hand off to the main semihosting implementation */
+	const int32_t result = semihosting_request(target, syscall, r1);
+
+	/* Write the result back to the target */
+	target_reg_write(target, 0, &result, sizeof(result));
+	/* Return if the request was in any way interrupted */
+	return target->tc->interrupted;
+}