regs->ARM_sp = infop->start_stack;
regs->ARM_r2 = tswapl(stack[2]); /* envp */
regs->ARM_r1 = tswapl(stack[1]); /* argv */
- regs->ARM_r0 = tswapl(stack[0]); /* argc */
+ /* XXX: it seems that r0 is zeroed after ! */
+ // regs->ARM_r0 = tswapl(stack[0]); /* argc */
+}
+
+#define USE_ELF_CORE_DUMP
+#define ELF_EXEC_PAGESIZE 4096
+
+#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->psr = 0;
+ regs->pc = infop->entry;
+ regs->npc = regs->pc + 4;
+ regs->y = 0;
+ regs->u_regs[14] = infop->start_stack - 16 * 4;
+}
+
+#endif
+
+#ifdef TARGET_PPC
+
+#define ELF_START_MMAP 0x80000000
+
+#define elf_check_arch(x) ( (x) == EM_PPC )
+
+#define ELF_CLASS ELFCLASS32
+#ifdef TARGET_WORDS_BIGENDIAN
+#define ELF_DATA ELFDATA2MSB
+#else
+#define ELF_DATA ELFDATA2LSB
+#endif
+#define ELF_ARCH EM_PPC
+
+/* Note that isn't exactly what regular kernel does
+ * but this is what the ABI wants and is needed to allow
+ * execution of PPC BSD programs.
+ */
+#define ELF_PLAT_INIT(_r) \
+do { \
+ unsigned long *pos = (unsigned long *)bprm->p, tmp = 1; \
+ _r->gpr[3] = bprm->argc; \
+ _r->gpr[4] = (unsigned long)++pos; \
+ for (; tmp != 0; pos++) \
+ tmp = *pos; \
+ _r->gpr[5] = (unsigned long)pos; \
+} while (0)
+
+/*
+ * We need to put in some extra aux table entries to tell glibc what
+ * the cache block size is, so it can use the dcbz instruction safely.
+ */
+#define AT_DCACHEBSIZE 19
+#define AT_ICACHEBSIZE 20
+#define AT_UCACHEBSIZE 21
+/* A special ignored type value for PPC, for glibc compatibility. */
+#define AT_IGNOREPPC 22
+/*
+ * The requirements here are:
+ * - keep the final alignment of sp (sp & 0xf)
+ * - make sure the 32-bit value at the first 16 byte aligned position of
+ * AUXV is greater than 16 for glibc compatibility.
+ * AT_IGNOREPPC is used for that.
+ * - for compatibility with glibc ARCH_DLINFO must always be defined on PPC,
+ * even if DLINFO_ARCH_ITEMS goes to zero or is undefined.
+ */
+#define DLINFO_ARCH_ITEMS 3
+#define ARCH_DLINFO \
+do { \
+ sp -= DLINFO_ARCH_ITEMS * 2; \
+ NEW_AUX_ENT(0, AT_DCACHEBSIZE, 0x20); \
+ NEW_AUX_ENT(1, AT_ICACHEBSIZE, 0x20); \
+ NEW_AUX_ENT(2, AT_UCACHEBSIZE, 0); \
+ /* \
+ * Now handle glibc compatibility. \
+ */ \
+ sp -= 2*2; \
+ NEW_AUX_ENT(0, AT_IGNOREPPC, AT_IGNOREPPC); \
+ NEW_AUX_ENT(1, AT_IGNOREPPC, AT_IGNOREPPC); \
+ } while (0)
+
+static inline void init_thread(struct target_pt_regs *_regs, struct image_info *infop)
+{
+ _regs->msr = 1 << MSR_PR; /* Set user mode */
+ _regs->gpr[1] = infop->start_stack;
+ _regs->nip = infop->entry;
}
#define USE_ELF_CORE_DUMP
#define INTERPRETER_AOUT 1
#define INTERPRETER_ELF 2
-#define DLINFO_ITEMS 12
+#define DLINFO_ITEMS 11
#define put_user(x,ptr) (void)(*(ptr) = (typeof(*ptr))(x))
#define get_user(ptr) (typeof(*ptr))(*(ptr))
--p; --tmp; --len;
if (--offset < 0) {
offset = p % TARGET_PAGE_SIZE;
- if (!(pag = (char *) page[p/TARGET_PAGE_SIZE]) &&
- !(pag = (char *) page[p/TARGET_PAGE_SIZE] =
- (unsigned long *) get_free_page())) {
- return 0;
+ pag = (char *) page[p/TARGET_PAGE_SIZE];
+ if (!pag) {
+ pag = (char *)get_free_page();
+ page[p/TARGET_PAGE_SIZE] = (unsigned long)pag;
+ if (!pag)
+ return 0;
}
}
if (len == 0 || offset == 0) {
}
-/* We need to explicitly zero any fractional pages
- after the data section (i.e. bss). This would
- contain the junk from the file that should not
- be in memory */
-
-
+/* We need to explicitly zero any fractional pages after the data
+ section (i.e. bss). This would contain the junk from the file that
+ should not be in memory. */
static void padzero(unsigned long elf_bss)
{
unsigned long nbyte;
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) {
nbyte = host_page_size - nbyte;
fpnt = (char *) elf_bss;
unsigned long interp_load_addr, int ibcs,
struct image_info *info)
{
- target_ulong *argv, *envp, *dlinfo;
- target_ulong *sp;
-
- /*
- * Force 16 byte alignment here for generality.
- */
+ target_ulong *argv, *envp;
+ target_ulong *sp, *csp;
+
+ /*
+ * Force 16 byte _final_ alignment here for generality.
+ */
sp = (unsigned int *) (~15UL & (unsigned long) p);
- sp -= exec ? DLINFO_ITEMS*2 : 2;
- dlinfo = sp;
+ csp = sp;
+ csp -= (DLINFO_ITEMS + 1) * 2;
+#ifdef DLINFO_ARCH_ITEMS
+ csp -= DLINFO_ARCH_ITEMS*2;
+#endif
+ csp -= envc+1;
+ csp -= argc+1;
+ csp -= (!ibcs ? 3 : 1); /* argc itself */
+ if ((unsigned long)csp & 15UL)
+ sp -= ((unsigned long)csp & 15UL) / sizeof(*sp);
+
+#define NEW_AUX_ENT(nr, id, val) \
+ put_user (tswapl(id), sp + (nr * 2)); \
+ put_user (tswapl(val), sp + (nr * 2 + 1))
+ sp -= 2;
+ NEW_AUX_ENT (0, AT_NULL, 0);
+
+ sp -= DLINFO_ITEMS*2;
+ NEW_AUX_ENT( 0, AT_PHDR, (target_ulong)(load_addr + exec->e_phoff));
+ NEW_AUX_ENT( 1, AT_PHENT, (target_ulong)(sizeof (struct elf_phdr)));
+ NEW_AUX_ENT( 2, AT_PHNUM, (target_ulong)(exec->e_phnum));
+ NEW_AUX_ENT( 3, AT_PAGESZ, (target_ulong)(TARGET_PAGE_SIZE));
+ NEW_AUX_ENT( 4, AT_BASE, (target_ulong)(interp_load_addr));
+ NEW_AUX_ENT( 5, AT_FLAGS, (target_ulong)0);
+ NEW_AUX_ENT( 6, AT_ENTRY, load_bias + exec->e_entry);
+ NEW_AUX_ENT( 7, AT_UID, (target_ulong) getuid());
+ NEW_AUX_ENT( 8, AT_EUID, (target_ulong) geteuid());
+ NEW_AUX_ENT( 9, AT_GID, (target_ulong) getgid());
+ NEW_AUX_ENT(11, AT_EGID, (target_ulong) getegid());
+#ifdef ARCH_DLINFO
+ /*
+ * ARCH_DLINFO must come last so platform specific code can enforce
+ * special alignment requirements on the AUXV if necessary (eg. PPC).
+ */
+ ARCH_DLINFO;
+#endif
+#undef NEW_AUX_ENT
+
sp -= envc+1;
envp = sp;
sp -= argc+1;
put_user(tswapl((target_ulong)envp),--sp);
put_user(tswapl((target_ulong)argv),--sp);
}
-
-#define NEW_AUX_ENT(id, val) \
- put_user (tswapl(id), dlinfo++); \
- put_user (tswapl(val), dlinfo++)
-
- if (exec) { /* Put this here for an ELF program interpreter */
- NEW_AUX_ENT (AT_PHDR, (target_ulong)(load_addr + exec->e_phoff));
- NEW_AUX_ENT (AT_PHENT, (target_ulong)(sizeof (struct elf_phdr)));
- NEW_AUX_ENT (AT_PHNUM, (target_ulong)(exec->e_phnum));
- NEW_AUX_ENT (AT_PAGESZ, (target_ulong)(TARGET_PAGE_SIZE));
- NEW_AUX_ENT (AT_BASE, (target_ulong)(interp_load_addr));
- NEW_AUX_ENT (AT_FLAGS, (target_ulong)0);
- NEW_AUX_ENT (AT_ENTRY, load_bias + exec->e_entry);
- NEW_AUX_ENT (AT_UID, (target_ulong) getuid());
- NEW_AUX_ENT (AT_EUID, (target_ulong) geteuid());
- NEW_AUX_ENT (AT_GID, (target_ulong) getgid());
- NEW_AUX_ENT (AT_EGID, (target_ulong) getegid());
- }
- NEW_AUX_ENT (AT_NULL, 0);
-#undef NEW_AUX_ENT
put_user(tswapl(argc),--sp);
info->arg_start = (unsigned int)((unsigned long)p & 0xffffffff);
while (argc-->0) {
create_elf_tables((char *)bprm->p,
bprm->argc,
bprm->envc,
- (interpreter_type == INTERPRETER_ELF ? &elf_ex : NULL),
+ &elf_ex,
load_addr, load_bias,
interp_load_addr,
(interpreter_type == INTERPRETER_AOUT ? 0 : 1),
projects / qemu / blobdiff