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

sparc support - hack to fix case where real_host_page_size < TARGET_PAGE_SIZE (typically sparc target case) 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@389 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2003-09-30 20:58:32 +00:00
parent 93ac68bca5
commit 853d6f7a83
1 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
linux-user/elfload.c
View File

@ -83,6 +83,27 @@ static inline void init_thread(struct target_pt_regs *regs, struct image_info *i
#endif #endif
#ifdef TARGET_SPARC
#define ELF_START_MMAP 0x80000000
#define elf_check_arch(x) ( (x) == EM_SPARC )
#define ELF_CLASS ELFCLASS32
#define ELF_DATA ELFDATA2MSB
#define ELF_ARCH EM_SPARC
/*XXX*/
#define ELF_PLAT_INIT(_r)
static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop)
{
regs->u_regs[0] = infop->entry;
regs->u_regs[1] = infop->start_stack;
}
#endif
#include "elf.h" #include "elf.h"
/* /*
@ -456,18 +477,32 @@ static void set_brk(unsigned long start, unsigned long end)
} }
/* We need to explicitly zero any fractional pages /* We need to explicitly zero any fractional pages after the data
after the data section (i.e. bss). This would section (i.e. bss). This would contain the junk from the file that
contain the junk from the file that should not should not be in memory. */
be in memory */
static void padzero(unsigned long elf_bss) static void padzero(unsigned long elf_bss)
{ {
unsigned long nbyte; unsigned long nbyte;
char * fpnt; char * fpnt;
nbyte = elf_bss & (host_page_size-1); /* was TARGET_PAGE_SIZE - JRP */ /* XXX: this is really a hack : if the real host page size is
smaller than the target page size, some pages after the end
of the file may not be mapped. A better fix would be to
patch target_mmap(), but it is more complicated as the file
size must be known */
if (real_host_page_size < host_page_size) {
unsigned long end_addr, end_addr1;
end_addr1 = (elf_bss + real_host_page_size - 1) &
~(real_host_page_size - 1);
end_addr = HOST_PAGE_ALIGN(elf_bss);
if (end_addr1 < end_addr) {
mmap((void *)end_addr1, end_addr - end_addr1,
PROT_READ|PROT_WRITE|PROT_EXEC,
MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
}
}
nbyte = elf_bss & (host_page_size-1);
if (nbyte) { if (nbyte) {
nbyte = host_page_size - nbyte; nbyte = host_page_size - nbyte;
fpnt = (char *) elf_bss; fpnt = (char *) elf_bss;