X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fsemihosting_common.c;h=59207897a4537b2c527d07a52a9b8b2a078d2f65;hb=ce8937a987620cb32de0ccad60ea06c296850139;hp=beeb4742ab2d9cb1bfe9a60866bd540a848ac3d1;hpb=2517bae6c1438350255dca63e7d1c1e06c64b6bb;p=openocd.git

diff --git a/src/target/semihosting_common.c b/src/target/semihosting_common.c
index beeb4742ab..59207897a4 100644
--- a/src/target/semihosting_common.c
+++ b/src/target/semihosting_common.c
@@ -225,6 +225,10 @@ int semihosting_common(struct target *target)
 			else {
 				int fd = semihosting_get_field(target, 0, fields);
 				if (semihosting->is_fileio) {
+					if (fd == 0 || fd == 1 || fd == 2) {
+						semihosting->result = 0;
+						break;
+					}
 					semihosting->hit_fileio = true;
 					fileio_info->identifier = "close";
 					fileio_info->param_1 = fd;
@@ -445,8 +449,8 @@ int semihosting_common(struct target *target)
 			 * - –1 if an error occurs.
 			 */
 			if (semihosting->is_fileio) {
-				LOG_ERROR("SYS_FLEN not supported by semihosting fileio");
-				return ERROR_FAIL;
+				semihosting->result = -1;
+				semihosting->sys_errno = EINVAL;
 			}
 			retval = semihosting_read_fields(target, 1, fields);
 			if (retval != ERROR_OK)
@@ -690,9 +694,19 @@ int semihosting_common(struct target *target)
 					/* TODO: implement the :semihosting-features special file.
 					 * */
 					if (semihosting->is_fileio) {
-						if (strcmp((char *)fn, ":tt") == 0)
-							semihosting->result = 0;
-						else {
+						if (strcmp((char *)fn, ":semihosting-features") == 0) {
+							semihosting->result = -1;
+							semihosting->sys_errno = EINVAL;
+						} else if (strcmp((char *)fn, ":tt") == 0) {
+							if (mode == 0)
+								semihosting->result = 0;
+							else if (mode == 4)
+								semihosting->result = 1;
+							else if (mode == 8)
+								semihosting->result = 2;
+							else
+								semihosting->result = -1;
+						} else {
 							semihosting->hit_fileio = true;
 							fileio_info->identifier = "open";
 							fileio_info->param_1 = addr;
@@ -1397,8 +1411,9 @@ static int semihosting_read_fields(struct target *target, size_t number,
 	uint8_t *fields)
 {
 	struct semihosting *semihosting = target->semihosting;
-	return target_read_memory(target, semihosting->param,
-			semihosting->word_size_bytes, number, fields);
+	/* Use 4-byte multiples to trigger fast memory access. */
+	return target_read_memory(target, semihosting->param, 4,
+			number * (semihosting->word_size_bytes / 4), fields);
 }
 
 /**
@@ -1408,8 +1423,9 @@ static int semihosting_write_fields(struct target *target, size_t number,
 	uint8_t *fields)
 {
 	struct semihosting *semihosting = target->semihosting;
-	return target_write_memory(target, semihosting->param,
-			semihosting->word_size_bytes, number, fields);
+	/* Use 4-byte multiples to trigger fast memory access. */
+	return target_write_memory(target, semihosting->param, 4,
+			number * (semihosting->word_size_bytes / 4), fields);
 }
 
 /**