OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge branch 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm 

* 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Remove out of date FIXME regarding saturating arithmetic
  target-arm: Implement abs_i32 inline rather than as a helper
  target-arm: Use TCG operation for Neon 64 bit negation
  arm-semi.c: Handle get/put_user() failure accessing arguments
This commit is contained in:
Blue Swirl 2012-10-27 14:21:37 +00:00
parent 9bca81624e 8b279a60dc
commit 8a52731705
6 changed files with 118 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
target-arm/arm-semi.c
View File

@ -166,17 +166,20 @@ static void arm_semi_flen_cb(CPUARMState *env, target_ulong ret, target_ulong er
#endif #endif
} }
#define ARG(n) \ /* Read the input value from the argument block; fail the semihosting
({ \ * call if the memory read fails.
target_ulong __arg; \ */
/* FIXME - handle get_user() failure */ \ #define GET_ARG(n) do { \
get_user_ual(__arg, args + (n) * 4); \ if (get_user_ual(arg ## n, args + (n) * 4)) { \
__arg; \ return (uint32_t)-1; \
}) } \
} while (0)
#define SET_ARG(n, val) put_user_ual(val, args + (n) * 4) #define SET_ARG(n, val) put_user_ual(val, args + (n) * 4)
uint32_t do_arm_semihosting(CPUARMState *env) uint32_t do_arm_semihosting(CPUARMState *env)
{ {
target_ulong args; target_ulong args;
target_ulong arg0, arg1, arg2, arg3;
char * s; char * s;
int nr; int nr;
uint32_t ret; uint32_t ret;
@ -191,33 +194,39 @@ uint32_t do_arm_semihosting(CPUARMState *env)
args = env->regs[1]; args = env->regs[1];
switch (nr) { switch (nr) {
case TARGET_SYS_OPEN: case TARGET_SYS_OPEN:
if (!(s = lock_user_string(ARG(0)))) GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
s = lock_user_string(arg0);
if (!s) {
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
if (ARG(1) >= 12) { }
unlock_user(s, ARG(0), 0); if (arg1 >= 12) {
unlock_user(s, arg0, 0);
return (uint32_t)-1; return (uint32_t)-1;
} }
if (strcmp(s, ":tt") == 0) { if (strcmp(s, ":tt") == 0) {
int result_fileno = ARG(1) < 4 ? STDIN_FILENO : STDOUT_FILENO; int result_fileno = arg1 < 4 ? STDIN_FILENO : STDOUT_FILENO;
unlock_user(s, ARG(0), 0); unlock_user(s, arg0, 0);
return result_fileno; return result_fileno;
} }
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "open,%s,%x,1a4", ARG(0), gdb_do_syscall(arm_semi_cb, "open,%s,%x,1a4", arg0,
(int)ARG(2)+1, gdb_open_modeflags[ARG(1)]); (int)arg2+1, gdb_open_modeflags[arg1]);
ret = env->regs[0]; ret = env->regs[0];
} else { } else {
ret = set_swi_errno(ts, open(s, open_modeflags[ARG(1)], 0644)); ret = set_swi_errno(ts, open(s, open_modeflags[arg1], 0644));
} }
unlock_user(s, ARG(0), 0); unlock_user(s, arg0, 0);
return ret; return ret;
case TARGET_SYS_CLOSE: case TARGET_SYS_CLOSE:
GET_ARG(0);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "close,%x", ARG(0)); gdb_do_syscall(arm_semi_cb, "close,%x", arg0);
return env->regs[0]; return env->regs[0];
} else { } else {
return set_swi_errno(ts, close(ARG(0))); return set_swi_errno(ts, close(arg0));
} }
case TARGET_SYS_WRITEC: case TARGET_SYS_WRITEC:
{ {
@ -248,35 +257,45 @@ uint32_t do_arm_semihosting(CPUARMState *env)
unlock_user(s, args, 0); unlock_user(s, args, 0);
return ret; return ret;
case TARGET_SYS_WRITE: case TARGET_SYS_WRITE:
len = ARG(2); GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
len = arg2;
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
arm_semi_syscall_len = len; arm_semi_syscall_len = len;
gdb_do_syscall(arm_semi_cb, "write,%x,%x,%x", ARG(0), ARG(1), len); gdb_do_syscall(arm_semi_cb, "write,%x,%x,%x", arg0, arg1, len);
return env->regs[0]; return env->regs[0];
} else { } else {
if (!(s = lock_user(VERIFY_READ, ARG(1), len, 1))) s = lock_user(VERIFY_READ, arg1, len, 1);
if (!s) {
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
ret = set_swi_errno(ts, write(ARG(0), s, len)); }
unlock_user(s, ARG(1), 0); ret = set_swi_errno(ts, write(arg0, s, len));
unlock_user(s, arg1, 0);
if (ret == (uint32_t)-1) if (ret == (uint32_t)-1)
return -1; return -1;
return len - ret; return len - ret;
} }
case TARGET_SYS_READ: case TARGET_SYS_READ:
len = ARG(2); GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
len = arg2;
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
arm_semi_syscall_len = len; arm_semi_syscall_len = len;
gdb_do_syscall(arm_semi_cb, "read,%x,%x,%x", ARG(0), ARG(1), len); gdb_do_syscall(arm_semi_cb, "read,%x,%x,%x", arg0, arg1, len);
return env->regs[0]; return env->regs[0];
} else { } else {
if (!(s = lock_user(VERIFY_WRITE, ARG(1), len, 0))) s = lock_user(VERIFY_WRITE, arg1, len, 0);
if (!s) {
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
do }
ret = set_swi_errno(ts, read(ARG(0), s, len)); do {
while (ret == -1 && errno == EINTR); ret = set_swi_errno(ts, read(arg0, s, len));
unlock_user(s, ARG(1), len); } while (ret == -1 && errno == EINTR);
unlock_user(s, arg1, len);
if (ret == (uint32_t)-1) if (ret == (uint32_t)-1)
return -1; return -1;
return len - ret; return len - ret;
@ -285,30 +304,34 @@ uint32_t do_arm_semihosting(CPUARMState *env)
/* XXX: Read from debug console. Not implemented. */ /* XXX: Read from debug console. Not implemented. */
return 0; return 0;
case TARGET_SYS_ISTTY: case TARGET_SYS_ISTTY:
GET_ARG(0);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "isatty,%x", ARG(0)); gdb_do_syscall(arm_semi_cb, "isatty,%x", arg0);
return env->regs[0]; return env->regs[0];
} else { } else {
return isatty(ARG(0)); return isatty(arg0);
} }
case TARGET_SYS_SEEK: case TARGET_SYS_SEEK:
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "lseek,%x,%x,0", ARG(0), ARG(1)); gdb_do_syscall(arm_semi_cb, "lseek,%x,%x,0", arg0, arg1);
return env->regs[0]; return env->regs[0];
} else { } else {
ret = set_swi_errno(ts, lseek(ARG(0), ARG(1), SEEK_SET)); ret = set_swi_errno(ts, lseek(arg0, arg1, SEEK_SET));
if (ret == (uint32_t)-1) if (ret == (uint32_t)-1)
return -1; return -1;
return 0; return 0;
} }
case TARGET_SYS_FLEN: case TARGET_SYS_FLEN:
GET_ARG(0);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_flen_cb, "fstat,%x,%x", gdb_do_syscall(arm_semi_flen_cb, "fstat,%x,%x",
ARG(0), env->regs[13]-64); arg0, env->regs[13]-64);
return env->regs[0]; return env->regs[0];
} else { } else {
struct stat buf; struct stat buf;
ret = set_swi_errno(ts, fstat(ARG(0), &buf)); ret = set_swi_errno(ts, fstat(arg0, &buf));
if (ret == (uint32_t)-1) if (ret == (uint32_t)-1)
return -1; return -1;
return buf.st_size; return buf.st_size;
@ -317,35 +340,43 @@ uint32_t do_arm_semihosting(CPUARMState *env)
/* XXX: Not implemented. */ /* XXX: Not implemented. */
return -1; return -1;
case TARGET_SYS_REMOVE: case TARGET_SYS_REMOVE:
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "unlink,%s", ARG(0), (int)ARG(1)+1); gdb_do_syscall(arm_semi_cb, "unlink,%s", arg0, (int)arg1+1);
ret = env->regs[0]; ret = env->regs[0];
} else { } else {
if (!(s = lock_user_string(ARG(0)))) s = lock_user_string(arg0);
if (!s) {
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
}
ret = set_swi_errno(ts, remove(s)); ret = set_swi_errno(ts, remove(s));
unlock_user(s, ARG(0), 0); unlock_user(s, arg0, 0);
} }
return ret; return ret;
case TARGET_SYS_RENAME: case TARGET_SYS_RENAME:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
GET_ARG(3);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "rename,%s,%s", gdb_do_syscall(arm_semi_cb, "rename,%s,%s",
ARG(0), (int)ARG(1)+1, ARG(2), (int)ARG(3)+1); arg0, (int)arg1+1, arg2, (int)arg3+1);
return env->regs[0]; return env->regs[0];
} else { } else {
char *s2; char *s2;
s = lock_user_string(ARG(0)); s = lock_user_string(arg0);
s2 = lock_user_string(ARG(2)); s2 = lock_user_string(arg2);
if (!s || !s2) if (!s || !s2)
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
ret = (uint32_t)-1; ret = (uint32_t)-1;
else else
ret = set_swi_errno(ts, rename(s, s2)); ret = set_swi_errno(ts, rename(s, s2));
if (s2) if (s2)
unlock_user(s2, ARG(2), 0); unlock_user(s2, arg2, 0);
if (s) if (s)
unlock_user(s, ARG(0), 0); unlock_user(s, arg0, 0);
return ret; return ret;
} }
case TARGET_SYS_CLOCK: case TARGET_SYS_CLOCK:
@ -353,15 +384,19 @@ uint32_t do_arm_semihosting(CPUARMState *env)
case TARGET_SYS_TIME: case TARGET_SYS_TIME:
return set_swi_errno(ts, time(NULL)); return set_swi_errno(ts, time(NULL));
case TARGET_SYS_SYSTEM: case TARGET_SYS_SYSTEM:
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(arm_semi_cb, "system,%s", ARG(0), (int)ARG(1)+1); gdb_do_syscall(arm_semi_cb, "system,%s", arg0, (int)arg1+1);
return env->regs[0]; return env->regs[0];
} else { } else {
if (!(s = lock_user_string(ARG(0)))) s = lock_user_string(arg0);
if (!s) {
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
}
ret = set_swi_errno(ts, system(s)); ret = set_swi_errno(ts, system(s));
unlock_user(s, ARG(0), 0); unlock_user(s, arg0, 0);
return ret; return ret;
} }
case TARGET_SYS_ERRNO: case TARGET_SYS_ERRNO:
@ -375,22 +410,24 @@ uint32_t do_arm_semihosting(CPUARMState *env)
/* Build a command-line from the original argv. /* Build a command-line from the original argv.
* *
* The inputs are: * The inputs are:
* * ARG(0), pointer to a buffer of at least the size * * arg0, pointer to a buffer of at least the size
* specified in ARG(1). * specified in arg1.
* * ARG(1), size of the buffer pointed to by ARG(0) in * * arg1, size of the buffer pointed to by arg0 in
* bytes. * bytes.
* *
* The outputs are: * The outputs are:
* * ARG(0), pointer to null-terminated string of the * * arg0, pointer to null-terminated string of the
* command line. * command line.
* * ARG(1), length of the string pointed to by ARG(0). * * arg1, length of the string pointed to by arg0.
*/ */
char *output_buffer; char *output_buffer;
size_t input_size = ARG(1); size_t input_size;
size_t output_size; size_t output_size;
int status = 0; int status = 0;
GET_ARG(0);
GET_ARG(1);
input_size = arg1;
/* Compute the size of the output string. */ /* Compute the size of the output string. */
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
output_size = strlen(ts->boot_info->kernel_filename) output_size = strlen(ts->boot_info->kernel_filename)
@ -414,10 +451,13 @@ uint32_t do_arm_semihosting(CPUARMState *env)
} }
/* Adjust the command-line length. */ /* Adjust the command-line length. */
SET_ARG(1, output_size - 1); if (SET_ARG(1, output_size - 1)) {
/* Couldn't write back to argument block */
return -1;
}
/* Lock the buffer on the ARM side. */ /* Lock the buffer on the ARM side. */
output_buffer = lock_user(VERIFY_WRITE, ARG(0), output_size, 0); output_buffer = lock_user(VERIFY_WRITE, arg0, output_size, 0);
if (!output_buffer) { if (!output_buffer) {
return -1; return -1;
} }
@ -449,7 +489,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
out: out:
#endif #endif
/* Unlock the buffer on the ARM side. */ /* Unlock the buffer on the ARM side. */
unlock_user(output_buffer, ARG(0), output_size); unlock_user(output_buffer, arg0, output_size);
return status; return status;
} }
@ -457,6 +497,7 @@ uint32_t do_arm_semihosting(CPUARMState *env)
{ {
uint32_t *ptr; uint32_t *ptr;
uint32_t limit; uint32_t limit;
GET_ARG(0);
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
/* Some C libraries assume the heap immediately follows .bss, so /* Some C libraries assume the heap immediately follows .bss, so
@ -477,25 +518,29 @@ uint32_t do_arm_semihosting(CPUARMState *env)
ts->heap_limit = limit; ts->heap_limit = limit;
} }
if (!(ptr = lock_user(VERIFY_WRITE, ARG(0), 16, 0))) ptr = lock_user(VERIFY_WRITE, arg0, 16, 0);
if (!ptr) {
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
}
ptr[0] = tswap32(ts->heap_base); ptr[0] = tswap32(ts->heap_base);
ptr[1] = tswap32(ts->heap_limit); ptr[1] = tswap32(ts->heap_limit);
ptr[2] = tswap32(ts->stack_base); ptr[2] = tswap32(ts->stack_base);
ptr[3] = tswap32(0); /* Stack limit. */ ptr[3] = tswap32(0); /* Stack limit. */
unlock_user(ptr, ARG(0), 16); unlock_user(ptr, arg0, 16);
#else #else
limit = ram_size; limit = ram_size;
if (!(ptr = lock_user(VERIFY_WRITE, ARG(0), 16, 0))) ptr = lock_user(VERIFY_WRITE, arg0, 16, 0);
if (!ptr) {
/* FIXME - should this error code be -TARGET_EFAULT ? */ /* FIXME - should this error code be -TARGET_EFAULT ? */
return (uint32_t)-1; return (uint32_t)-1;
}
/* TODO: Make this use the limit of the loaded application. */ /* TODO: Make this use the limit of the loaded application. */
ptr[0] = tswap32(limit / 2); ptr[0] = tswap32(limit / 2);
ptr[1] = tswap32(limit); ptr[1] = tswap32(limit);
ptr[2] = tswap32(limit); /* Stack base */ ptr[2] = tswap32(limit); /* Stack base */
ptr[3] = tswap32(0); /* Stack limit. */ ptr[3] = tswap32(0); /* Stack limit. */
unlock_user(ptr, ARG(0), 16); unlock_user(ptr, arg0, 16);
#endif #endif
return 0; return 0;
} }

5
target-arm/helper.c
View File

@ -1562,11 +1562,6 @@ uint32_t HELPER(rbit)(uint32_t x)
return x; return x;
} }
uint32_t HELPER(abs)(uint32_t x)
{
return ((int32_t)x < 0) ? -x : x;
}
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
void do_interrupt (CPUARMState *env) void do_interrupt (CPUARMState *env)

2
target-arm/helper.h
View File

@ -13,7 +13,6 @@ DEF_HELPER_2(double_saturate, i32, env, s32)
DEF_HELPER_FLAGS_2(sdiv, TCG_CALL_CONST | TCG_CALL_PURE, s32, s32, s32) DEF_HELPER_FLAGS_2(sdiv, TCG_CALL_CONST | TCG_CALL_PURE, s32, s32, s32)
DEF_HELPER_FLAGS_2(udiv, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32, i32) DEF_HELPER_FLAGS_2(udiv, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32, i32)
DEF_HELPER_FLAGS_1(rbit, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32) DEF_HELPER_FLAGS_1(rbit, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32)
DEF_HELPER_FLAGS_1(abs, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32)
#define PAS_OP(pfx) \ #define PAS_OP(pfx) \
DEF_HELPER_3(pfx ## add8, i32, i32, i32, ptr) \ DEF_HELPER_3(pfx ## add8, i32, i32, i32, ptr) \
@ -339,7 +338,6 @@ DEF_HELPER_2(neon_mull_s16, i64, i32, i32)
DEF_HELPER_1(neon_negl_u16, i64, i64) DEF_HELPER_1(neon_negl_u16, i64, i64)
DEF_HELPER_1(neon_negl_u32, i64, i64) DEF_HELPER_1(neon_negl_u32, i64, i64)
DEF_HELPER_1(neon_negl_u64, i64, i64)
DEF_HELPER_2(neon_qabs_s8, i32, env, i32) DEF_HELPER_2(neon_qabs_s8, i32, env, i32)
DEF_HELPER_2(neon_qabs_s16, i32, env, i32) DEF_HELPER_2(neon_qabs_s16, i32, env, i32)

6
target-arm/neon_helper.c
View File

@ -1664,12 +1664,6 @@ uint64_t HELPER(neon_negl_u32)(uint64_t x)
return low | ((uint64_t)high << 32); return low | ((uint64_t)high << 32);
} }
/* FIXME: There should be a native op for this. */
uint64_t HELPER(neon_negl_u64)(uint64_t x)
{
return -x;
}
/* Saturating sign manipulation. */ /* Saturating sign manipulation. */
/* ??? Make these use NEON_VOP1 */ /* ??? Make these use NEON_VOP1 */
#define DO_QABS8(x) do { \ #define DO_QABS8(x) do { \

2
target-arm/op_helper.c
View File

@ -93,8 +93,6 @@ void tlb_fill(CPUARMState *env, target_ulong addr, int is_write, int mmu_idx,
} }
#endif #endif
/* FIXME: Pass an explicit pointer to QF to CPUARMState, and move saturating
instructions into helper.c */
uint32_t HELPER(add_setq)(CPUARMState *env, uint32_t a, uint32_t b) uint32_t HELPER(add_setq)(CPUARMState *env, uint32_t a, uint32_t b)
{ {
uint32_t res = a + b; uint32_t res = a + b;

15
target-arm/translate.c
View File

@ -462,8 +462,15 @@ static void gen_sar(TCGv dest, TCGv t0, TCGv t1)
tcg_temp_free_i32(tmp1); tcg_temp_free_i32(tmp1);
} }
/* FIXME: Implement this natively. */ static void tcg_gen_abs_i32(TCGv dest, TCGv src)
#define tcg_gen_abs_i32(t0, t1) gen_helper_abs(t0, t1) {
TCGv c0 = tcg_const_i32(0);
TCGv tmp = tcg_temp_new_i32();
tcg_gen_neg_i32(tmp, src);
tcg_gen_movcond_i32(TCG_COND_GT, dest, src, c0, src, tmp);
tcg_temp_free_i32(c0);
tcg_temp_free_i32(tmp);
}
static void shifter_out_im(TCGv var, int shift) static void shifter_out_im(TCGv var, int shift)
{ {
@ -4184,7 +4191,9 @@ static inline void gen_neon_negl(TCGv_i64 var, int size)
switch (size) { switch (size) {
case 0: gen_helper_neon_negl_u16(var, var); break; case 0: gen_helper_neon_negl_u16(var, var); break;
case 1: gen_helper_neon_negl_u32(var, var); break; case 1: gen_helper_neon_negl_u32(var, var); break;
case 2: gen_helper_neon_negl_u64(var, var); break; case 2:
tcg_gen_neg_i64(var, var);
break;
default: abort(); default: abort();
} }
} }