david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target/xtensa: fix semihosting argc/argv implementation

Browse Source 
So far xtensa provides fixed dummy argc/argv for the corresponding
semihosting calls. Now that there are semihosting_get_argc and
semihosting_get_arg, use them to pass actual command line arguments
to guest.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Max Filippov 2017-03-11 11:24:45 -08:00
parent 0e80359e62
commit f289bb091e
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
target/xtensa/xtensa-semi.c
View File

@ -28,6 +28,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "cpu.h" #include "cpu.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "exec/semihost.h"
#include "qemu/log.h" #include "qemu/log.h"
enum { enum {
@ -261,28 +262,50 @@ void HELPER(simcall)(CPUXtensaState *env)
break; break;
case TARGET_SYS_argc: case TARGET_SYS_argc:
regs[2] = 1; regs[2] = semihosting_get_argc();
regs[3] = 0; regs[3] = 0;
break; break;
case TARGET_SYS_argv_sz: case TARGET_SYS_argv_sz:
regs[2] = 128; {
regs[3] = 0; int argc = semihosting_get_argc();
int sz = (argc + 1) * sizeof(uint32_t);
int i;
for (i = 0; i < argc; ++i) {
sz += 1 + strlen(semihosting_get_arg(i));
}
regs[2] = sz;
regs[3] = 0;
}
break; break;
case TARGET_SYS_argv: case TARGET_SYS_argv:
{ {
struct Argv { int argc = semihosting_get_argc();
uint32_t argptr[2]; int str_offset = (argc + 1) * sizeof(uint32_t);
char text[120]; int i;
} argv = { uint32_t argptr;
{0, 0},
"test"
};
argv.argptr[0] = tswap32(regs[3] + offsetof(struct Argv, text)); for (i = 0; i < argc; ++i) {
const char *str = semihosting_get_arg(i);
int str_size = strlen(str) + 1;
argptr = tswap32(regs[3] + str_offset);
cpu_memory_rw_debug(cs,
regs[3] + i * sizeof(uint32_t),
(uint8_t *)&argptr, sizeof(argptr), 1);
cpu_memory_rw_debug(cs,
regs[3] + str_offset,
(uint8_t *)str, str_size, 1);
str_offset += str_size;
}
argptr = 0;
cpu_memory_rw_debug(cs, cpu_memory_rw_debug(cs,
regs[3], (uint8_t *)&argv, sizeof(argv), 1); regs[3] + i * sizeof(uint32_t),
(uint8_t *)&argptr, sizeof(argptr), 1);
regs[3] = 0;
} }
break; break;