X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_semihosting.c;h=115c7d4e498b44f2fc75b974b57b3d7e66e5d854;hp=f4244c84d11c15985590e2abda59317f1db34fb3;hb=bb3793c9a4ccd232c4ee3ce0a36bf200589ca0bb;hpb=0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d diff --git a/src/target/arm_semihosting.c b/src/target/arm_semihosting.c index f4244c84d1..115c7d4e49 100644 --- a/src/target/arm_semihosting.c +++ b/src/target/arm_semihosting.c @@ -2,6 +2,9 @@ * Copyright (C) 2009 by Marvell Technology Group Ltd. * * Written by Nicolas Pitre * * * + * Copyright (C) 2010 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 * @@ -36,19 +39,35 @@ #include "arm.h" #include "armv4_5.h" +#include "arm7_9_common.h" +#include "armv7m.h" +#include "cortex_m.h" #include "register.h" #include "arm_semihosting.h" #include #include - +#include + +static int open_modeflags[12] = { + O_RDONLY, + O_RDONLY | O_BINARY, + O_RDWR, + O_RDWR | O_BINARY, + O_WRONLY | O_CREAT | O_TRUNC, + O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, + O_RDWR | O_CREAT | O_TRUNC, + O_RDWR | O_CREAT | O_TRUNC | O_BINARY, + O_WRONLY | O_CREAT | O_APPEND, + O_WRONLY | O_CREAT | O_APPEND | O_BINARY, + O_RDWR | O_CREAT | O_APPEND, + O_RDWR | O_CREAT | O_APPEND | O_BINARY +}; static int do_semihosting(struct target *target) { - struct arm *armv4_5 = target_to_arm(target); - uint32_t r0 = buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32); - uint32_t r1 = buf_get_u32(armv4_5->core_cache->reg_list[1].value, 0, 32); - uint32_t lr = buf_get_u32(ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, ARM_MODE_SVC, 14).value, 0, 32); - uint32_t spsr = buf_get_u32(armv4_5->spsr->value, 0, 32);; + struct arm *arm = target_to_arm(target); + uint32_t r0 = buf_get_u32(arm->core_cache->reg_list[0].value, 0, 32); + uint32_t r1 = buf_get_u32(arm->core_cache->reg_list[1].value, 0, 32); uint8_t params[16]; int retval, result; @@ -72,32 +91,25 @@ static int do_semihosting(struct target *target) uint32_t l = target_buffer_get_u32(target, params+8); if (l <= 255 && m <= 11) { uint8_t fn[256]; - int mode; retval = target_read_memory(target, a, 1, l, fn); if (retval != ERROR_OK) return retval; fn[l] = 0; - if (m & 0x2) - mode = O_RDWR; - else if (m & 0xc) - mode = O_WRONLY; - else - mode = O_RDONLY; - if (m >= 8) - mode |= O_CREAT|O_APPEND; - else if (m >= 4) - mode |= O_CREAT|O_TRUNC; if (strcmp((char *)fn, ":tt") == 0) { - if ((mode & 3) == 0) - result = dup(0); + if (m < 4) + result = dup(STDIN_FILENO); else - result = dup(1); - } else - result = open((char *)fn, mode); - armv4_5->semihosting_errno = errno; + result = dup(STDOUT_FILENO); + } else { + /* cygwin requires the permission setting + * otherwise it will fail to reopen a previously + * written file */ + result = open((char *)fn, open_modeflags[m], 0644); + } + arm->semihosting_errno = errno; } else { result = -1; - armv4_5->semihosting_errno = EINVAL; + arm->semihosting_errno = EINVAL; } } break; @@ -109,7 +121,7 @@ static int do_semihosting(struct target *target) else { int fd = target_buffer_get_u32(target, params+0); result = close(fd); - armv4_5->semihosting_errno = errno; + arm->semihosting_errno = errno; } break; @@ -127,7 +139,7 @@ static int do_semihosting(struct target *target) case 0x04: /* SYS_WRITE0 */ do { unsigned char c; - retval = target_read_memory(target, r1, 1, 1, &c); + retval = target_read_memory(target, r1++, 1, 1, &c); if (retval != ERROR_OK) return retval; if (!c) @@ -148,7 +160,7 @@ static int do_semihosting(struct target *target) uint8_t *buf = malloc(l); if (!buf) { result = -1; - armv4_5->semihosting_errno = ENOMEM; + arm->semihosting_errno = ENOMEM; } else { retval = target_read_buffer(target, a, l, buf); if (retval != ERROR_OK) { @@ -156,7 +168,7 @@ static int do_semihosting(struct target *target) return retval; } result = write(fd, buf, l); - armv4_5->semihosting_errno = errno; + arm->semihosting_errno = errno; if (result >= 0) result = l - result; free(buf); @@ -175,11 +187,11 @@ static int do_semihosting(struct target *target) uint8_t *buf = malloc(l); if (!buf) { result = -1; - armv4_5->semihosting_errno = ENOMEM; + arm->semihosting_errno = ENOMEM; } else { result = read(fd, buf, l); - armv4_5->semihosting_errno = errno; - if (result > 0) { + arm->semihosting_errno = errno; + if (result >= 0) { retval = target_write_buffer(target, a, result, buf); if (retval != ERROR_OK) { free(buf); @@ -218,7 +230,7 @@ static int do_semihosting(struct target *target) int fd = target_buffer_get_u32(target, params+0); off_t pos = target_buffer_get_u32(target, params+4); result = lseek(fd, pos, SEEK_SET); - armv4_5->semihosting_errno = errno; + arm->semihosting_errno = errno; if (result == pos) result = 0; } @@ -230,18 +242,14 @@ static int do_semihosting(struct target *target) return retval; else { int fd = target_buffer_get_u32(target, params+0); - off_t cur = lseek(fd, 0, SEEK_CUR); - if (cur == (off_t)-1) { - armv4_5->semihosting_errno = errno; + struct stat buf; + result = fstat(fd, &buf); + if (result == -1) { + arm->semihosting_errno = errno; result = -1; break; } - result = lseek(fd, 0, SEEK_END); - armv4_5->semihosting_errno = errno; - if (lseek(fd, cur, SEEK_SET) == (off_t)-1) { - armv4_5->semihosting_errno = errno; - result = -1; - } + result = buf.st_size; } break; @@ -259,10 +267,10 @@ static int do_semihosting(struct target *target) return retval; fn[l] = 0; result = remove((char *)fn); - armv4_5->semihosting_errno = errno; + arm->semihosting_errno = errno; } else { result = -1; - armv4_5->semihosting_errno = EINVAL; + arm->semihosting_errno = EINVAL; } } break; @@ -287,10 +295,10 @@ static int do_semihosting(struct target *target) fn1[l1] = 0; fn2[l2] = 0; result = rename((char *)fn1, (char *)fn2); - armv4_5->semihosting_errno = errno; + arm->semihosting_errno = errno; } else { result = -1; - armv4_5->semihosting_errno = EINVAL; + arm->semihosting_errno = EINVAL; } } break; @@ -300,7 +308,7 @@ static int do_semihosting(struct target *target) break; case 0x13: /* SYS_ERRNO */ - result = armv4_5->semihosting_errno; + result = arm->semihosting_errno; break; case 0x15: /* SYS_GET_CMDLINE */ @@ -315,7 +323,7 @@ static int do_semihosting(struct target *target) if (l < s) result = -1; else { - retval = target_write_buffer(target, a, s, (void*)arg); + retval = target_write_buffer(target, a, s, (void *)arg); if (retval != ERROR_OK) return retval; result = 0; @@ -376,25 +384,47 @@ static int do_semihosting(struct target *target) fprintf(stderr, "semihosting: unsupported call %#x\n", (unsigned) r0); result = -1; - armv4_5->semihosting_errno = ENOTSUP; + arm->semihosting_errno = ENOTSUP; } /* resume execution to the original mode */ - /* return value in R0 */ - buf_set_u32(armv4_5->core_cache->reg_list[0].value, 0, 32, result); - armv4_5->core_cache->reg_list[0].dirty = 1; + /* REVISIT this looks wrong ... ARM11 and Cortex-A8 + * should work this way at least sometimes. + */ + if (is_arm7_9(target_to_arm7_9(target))) { + uint32_t spsr; + + /* return value in R0 */ + buf_set_u32(arm->core_cache->reg_list[0].value, 0, 32, result); + arm->core_cache->reg_list[0].dirty = 1; - /* LR --> PC */ - buf_set_u32(armv4_5->core_cache->reg_list[15].value, 0, 32, lr); - armv4_5->core_cache->reg_list[15].dirty = 1; + /* LR --> PC */ + buf_set_u32(arm->core_cache->reg_list[15].value, 0, 32, + buf_get_u32(arm_reg_current(arm, 14)->value, 0, 32)); + arm->core_cache->reg_list[15].dirty = 1; - /* saved PSR --> current PSR */ - buf_set_u32(armv4_5->cpsr->value, 0, 32, spsr); - armv4_5->cpsr->dirty = 1; - armv4_5->core_mode = spsr & 0x1f; - if (spsr & 0x20) - armv4_5->core_state = ARM_STATE_THUMB; + /* saved PSR --> current PSR */ + spsr = buf_get_u32(arm->spsr->value, 0, 32); + + /* REVISIT should this be arm_set_cpsr(arm, spsr) + * instead of a partially unrolled version? + */ + + buf_set_u32(arm->cpsr->value, 0, 32, spsr); + arm->cpsr->dirty = 1; + arm->core_mode = spsr & 0x1f; + if (spsr & 0x20) + arm->core_state = ARM_STATE_THUMB; + + } else { + /* resume execution, this will be pc+2 to skip over the + * bkpt instruction */ + + /* return result in R0 */ + buf_set_u32(arm->core_cache->reg_list[0].value, 0, 32, result); + arm->core_cache->reg_list[0].dirty = 1; + } return target_resume(target, 1, 0, 0, 0); } @@ -418,59 +448,84 @@ int arm_semihosting(struct target *target, int *retval) uint32_t pc, lr, spsr; struct reg *r; - if (!arm->is_semihosting || arm->core_mode != ARM_MODE_SVC) + if (!arm->is_semihosting) return 0; - /* Check for PC == 0x00000008 or 0xffff0008: Supervisor Call vector. */ - r = arm->core_cache->reg_list + 15; - pc = buf_get_u32(r->value, 0, 32); - if (pc != 0x00000008 && pc != 0xffff0008) - return 0; + if (is_arm7_9(target_to_arm7_9(target))) { + if (arm->core_mode != ARM_MODE_SVC) + return 0; - r = arm_reg_current(arm, 14); - lr = buf_get_u32(r->value, 0, 32); + /* Check for PC == 0x00000008 or 0xffff0008: Supervisor Call vector. */ + r = arm->pc; + pc = buf_get_u32(r->value, 0, 32); + if (pc != 0x00000008 && pc != 0xffff0008) + return 0; - /* Core-specific code should make sure SPSR is retrieved - * when the above checks pass... - */ - if (!arm->spsr->valid) { - LOG_ERROR("SPSR not valid!"); - *retval = ERROR_FAIL; - return 1; - } + r = arm_reg_current(arm, 14); + lr = buf_get_u32(r->value, 0, 32); - spsr = buf_get_u32(arm->spsr->value, 0, 32); + /* Core-specific code should make sure SPSR is retrieved + * when the above checks pass... + */ + if (!arm->spsr->valid) { + LOG_ERROR("SPSR not valid!"); + *retval = ERROR_FAIL; + return 1; + } - /* check instruction that triggered this trap */ - if (spsr & (1 << 5)) { - /* was in Thumb (or ThumbEE) mode */ - uint8_t insn_buf[2]; - uint16_t insn; + spsr = buf_get_u32(arm->spsr->value, 0, 32); - *retval = target_read_memory(target, lr-2, 2, 1, insn_buf); - if (*retval != ERROR_OK) - return 1; - insn = target_buffer_get_u16(target, insn_buf); + /* check instruction that triggered this trap */ + if (spsr & (1 << 5)) { + /* was in Thumb (or ThumbEE) mode */ + uint8_t insn_buf[2]; + uint16_t insn; - /* SVC 0xab */ - if (insn != 0xDFAB) + *retval = target_read_memory(target, lr-2, 2, 1, insn_buf); + if (*retval != ERROR_OK) + return 1; + insn = target_buffer_get_u16(target, insn_buf); + + /* SVC 0xab */ + if (insn != 0xDFAB) + return 0; + } else if (spsr & (1 << 24)) { + /* was in Jazelle mode */ return 0; - } else if (spsr & (1 << 24)) { - /* was in Jazelle mode */ - return 0; - } else { - /* was in ARM mode */ - uint8_t insn_buf[4]; - uint32_t insn; + } else { + /* was in ARM mode */ + uint8_t insn_buf[4]; + uint32_t insn; + + *retval = target_read_memory(target, lr-4, 4, 1, insn_buf); + if (*retval != ERROR_OK) + return 1; + insn = target_buffer_get_u32(target, insn_buf); + + /* SVC 0x123456 */ + if (insn != 0xEF123456) + return 0; + } + } else if (is_armv7m(target_to_armv7m(target))) { + uint16_t insn; + + if (target->debug_reason != DBG_REASON_BREAKPOINT) + return 0; + + r = arm->pc; + pc = buf_get_u32(r->value, 0, 32); - *retval = target_read_memory(target, lr-4, 4, 1, insn_buf); + pc &= ~1; + *retval = target_read_u16(target, pc, &insn); if (*retval != ERROR_OK) return 1; - insn = target_buffer_get_u32(target, insn_buf); - /* SVC 0x123456 */ - if (insn != 0xEF123456) + /* bkpt 0xAB */ + if (insn != 0xBEAB) return 0; + } else { + LOG_ERROR("Unsupported semi-hosting Target"); + return 0; } *retval = do_semihosting(target);