ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bsd-user: pass the bsd_param into loader_exec 

Pass the bsd_param into loader_exec, and adjust. We use it to track the
inital stack allocation and to set stack, open files, and other state
shared between bsdload.c and elfload.c

Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Warner Losh 2021-04-29 18:45:13 -06:00
parent 66ef252fab
commit d37853f92f
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bsd-user/bsdload.c
View File

@ -140,35 +140,36 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
} }
int loader_exec(const char *filename, char **argv, char **envp, int loader_exec(const char *filename, char **argv, char **envp,
struct target_pt_regs *regs, struct image_info *infop) struct target_pt_regs *regs, struct image_info *infop,
struct bsd_binprm *bprm)
{ {
struct bsd_binprm bprm;
int retval; int retval;
int i; int i;
bprm.p = TARGET_PAGE_SIZE * MAX_ARG_PAGES - sizeof(unsigned int); bprm->p = TARGET_PAGE_SIZE * MAX_ARG_PAGES - sizeof(unsigned int);
for (i = 0 ; i < MAX_ARG_PAGES ; i++) { /* clear page-table */ for (i = 0; i < MAX_ARG_PAGES; i++) { /* clear page-table */
bprm.page[i] = NULL; bprm->page[i] = NULL;
} }
retval = open(filename, O_RDONLY); retval = open(filename, O_RDONLY);
if (retval < 0) { if (retval < 0) {
return retval; return retval;
} }
bprm.fd = retval;
bprm.filename = (char *)filename;
bprm.argc = count(argv);
bprm.argv = argv;
bprm.envc = count(envp);
bprm.envp = envp;
retval = prepare_binprm(&bprm); bprm->fd = retval;
bprm->filename = (char *)filename;
bprm->argc = count(argv);
bprm->argv = argv;
bprm->envc = count(envp);
bprm->envp = envp;
retval = prepare_binprm(bprm);
if (retval >= 0) { if (retval >= 0) {
if (bprm.buf[0] == 0x7f if (bprm->buf[0] == 0x7f
&& bprm.buf[1] == 'E' && bprm->buf[1] == 'E'
&& bprm.buf[2] == 'L' && bprm->buf[2] == 'L'
&& bprm.buf[3] == 'F') { && bprm->buf[3] == 'F') {
retval = load_elf_binary(&bprm, regs, infop); retval = load_elf_binary(bprm, regs, infop);
} else { } else {
fprintf(stderr, "Unknown binary format\n"); fprintf(stderr, "Unknown binary format\n");
return -1; return -1;
@ -183,7 +184,7 @@ int loader_exec(const char *filename, char **argv, char **envp,
/* Something went wrong, return the inode and free the argument pages*/ /* Something went wrong, return the inode and free the argument pages*/
for (i = 0 ; i < MAX_ARG_PAGES ; i++) { for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
g_free(bprm.page[i]); g_free(bprm->page[i]);
} }
return retval; return retval;
} }

7
bsd-user/main.c
View File

@ -343,6 +343,7 @@ int main(int argc, char **argv)
const char *log_mask = NULL; const char *log_mask = NULL;
struct target_pt_regs regs1, *regs = &regs1; struct target_pt_regs regs1, *regs = &regs1;
struct image_info info1, *info = &info1; struct image_info info1, *info = &info1;
struct bsd_binprm bprm;
TaskState ts1, *ts = &ts1; TaskState ts1, *ts = &ts1;
CPUArchState *env; CPUArchState *env;
CPUState *cpu; CPUState *cpu;
@ -499,6 +500,9 @@ int main(int argc, char **argv)
/* Zero out regs */ /* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs)); memset(regs, 0, sizeof(struct target_pt_regs));
/* Zero bsd params */
memset(&bprm, 0, sizeof(bprm));
/* Zero out image_info */ /* Zero out image_info */
memset(info, 0, sizeof(struct image_info)); memset(info, 0, sizeof(struct image_info));
@ -566,7 +570,8 @@ int main(int argc, char **argv)
} }
} }
if (loader_exec(filename, argv + optind, target_environ, regs, info) != 0) { if (loader_exec(filename, argv + optind, target_environ, regs, info,
&bprm) != 0) {
printf("Error loading %s\n", filename); printf("Error loading %s\n", filename);
_exit(1); _exit(1);
} }

3
bsd-user/qemu.h
View File

@ -131,7 +131,8 @@ void do_init_thread(struct target_pt_regs *regs, struct image_info *infop);
abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
abi_ulong stringp, int push_ptr); abi_ulong stringp, int push_ptr);
int loader_exec(const char *filename, char **argv, char **envp, int loader_exec(const char *filename, char **argv, char **envp,
struct target_pt_regs *regs, struct image_info *infop); struct target_pt_regs *regs, struct image_info *infop,
struct bsd_binprm *bprm);
int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs,
struct image_info *info); struct image_info *info);