diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-23 21:28:20 (GMT) |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-23 05:55:22 (GMT) |
commit | aa7bd942498512d6b77d1d0da846a8ecdd5d6186 (patch) | |
tree | 9a420b59a1e862ea47a4c5f89601ffbdf3366922 /arch/um/sys-i386 | |
parent | 4198426af37e7122f2fda2538fa9dcaa19c5e397 (diff) | |
download | linux-aa7bd942498512d6b77d1d0da846a8ecdd5d6186.tar.xz |
x86, um: get rid of header symlinks
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/sys-i386')
-rw-r--r-- | arch/um/sys-i386/asm/archparam.h | 26 | ||||
-rw-r--r-- | arch/um/sys-i386/asm/elf.h | 163 | ||||
-rw-r--r-- | arch/um/sys-i386/asm/module.h | 13 | ||||
-rw-r--r-- | arch/um/sys-i386/asm/processor.h | 78 | ||||
-rw-r--r-- | arch/um/sys-i386/asm/ptrace.h | 56 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/archsetjmp.h (renamed from arch/um/sys-i386/sysdep/archsetjmp.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/barrier.h (renamed from arch/um/sys-i386/sysdep/barrier.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/checksum.h (renamed from arch/um/sys-i386/sysdep/checksum.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/faultinfo.h (renamed from arch/um/sys-i386/sysdep/faultinfo.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/host_ldt.h (renamed from arch/um/sys-i386/sysdep/host_ldt.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/kernel-offsets.h (renamed from arch/um/sys-i386/sysdep/kernel-offsets.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/ptrace.h (renamed from arch/um/sys-i386/sysdep/ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/ptrace_user.h (renamed from arch/um/sys-i386/sysdep/ptrace_user.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/sc.h (renamed from arch/um/sys-i386/sysdep/sc.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/sigcontext.h (renamed from arch/um/sys-i386/sysdep/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/skas_ptrace.h (renamed from arch/um/sys-i386/sysdep/skas_ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/stub.h (renamed from arch/um/sys-i386/sysdep/stub.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/syscalls.h (renamed from arch/um/sys-i386/sysdep/syscalls.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/system.h (renamed from arch/um/sys-i386/sysdep/system.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/tls.h (renamed from arch/um/sys-i386/sysdep/tls.h) | 0 | ||||
-rw-r--r-- | arch/um/sys-i386/shared/sysdep/vm-flags.h (renamed from arch/um/sys-i386/sysdep/vm-flags.h) | 0 |
21 files changed, 336 insertions, 0 deletions
diff --git a/arch/um/sys-i386/asm/archparam.h b/arch/um/sys-i386/asm/archparam.h new file mode 100644 index 0000000..93fd723 --- /dev/null +++ b/arch/um/sys-i386/asm/archparam.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com) + * Licensed under the GPL + */ + +#ifndef __UM_ARCHPARAM_I386_H +#define __UM_ARCHPARAM_I386_H + +#ifdef CONFIG_X86_PAE +#define LAST_PKMAP 512 +#else +#define LAST_PKMAP 1024 +#endif + +#endif + +/* + * Overrides for Emacs so that we follow Linus's tabbing style. + * Emacs will notice this stuff at the end of the file and automatically + * adjust the settings for this buffer only. This must remain at the end + * of the file. + * --------------------------------------------------------------------------- + * Local variables: + * c-file-style: "linux" + * End: + */ diff --git a/arch/um/sys-i386/asm/elf.h b/arch/um/sys-i386/asm/elf.h new file mode 100644 index 0000000..d0da9d7 --- /dev/null +++ b/arch/um/sys-i386/asm/elf.h @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) + * Licensed under the GPL + */ +#ifndef __UM_ELF_I386_H +#define __UM_ELF_I386_H + +#include <asm/user.h> +#include "skas.h" + +#define R_386_NONE 0 +#define R_386_32 1 +#define R_386_PC32 2 +#define R_386_GOT32 3 +#define R_386_PLT32 4 +#define R_386_COPY 5 +#define R_386_GLOB_DAT 6 +#define R_386_JMP_SLOT 7 +#define R_386_RELATIVE 8 +#define R_386_GOTOFF 9 +#define R_386_GOTPC 10 +#define R_386_NUM 11 + +typedef unsigned long elf_greg_t; + +#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t)) +typedef elf_greg_t elf_gregset_t[ELF_NGREG]; + +typedef struct user_i387_struct elf_fpregset_t; + +/* + * This is used to ensure we don't load something for the wrong architecture. + */ +#define elf_check_arch(x) \ + (((x)->e_machine == EM_386) || ((x)->e_machine == EM_486)) + +#define ELF_CLASS ELFCLASS32 +#define ELF_DATA ELFDATA2LSB +#define ELF_ARCH EM_386 + +#define ELF_PLAT_INIT(regs, load_addr) do { \ + PT_REGS_EBX(regs) = 0; \ + PT_REGS_ECX(regs) = 0; \ + PT_REGS_EDX(regs) = 0; \ + PT_REGS_ESI(regs) = 0; \ + PT_REGS_EDI(regs) = 0; \ + PT_REGS_EBP(regs) = 0; \ + PT_REGS_EAX(regs) = 0; \ +} while (0) + +#define USE_ELF_CORE_DUMP +#define ELF_EXEC_PAGESIZE 4096 + +#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) + +/* Shamelessly stolen from include/asm-i386/elf.h */ + +#define ELF_CORE_COPY_REGS(pr_reg, regs) do { \ + pr_reg[0] = PT_REGS_EBX(regs); \ + pr_reg[1] = PT_REGS_ECX(regs); \ + pr_reg[2] = PT_REGS_EDX(regs); \ + pr_reg[3] = PT_REGS_ESI(regs); \ + pr_reg[4] = PT_REGS_EDI(regs); \ + pr_reg[5] = PT_REGS_EBP(regs); \ + pr_reg[6] = PT_REGS_EAX(regs); \ + pr_reg[7] = PT_REGS_DS(regs); \ + pr_reg[8] = PT_REGS_ES(regs); \ + /* fake once used fs and gs selectors? */ \ + pr_reg[9] = PT_REGS_DS(regs); \ + pr_reg[10] = PT_REGS_DS(regs); \ + pr_reg[11] = PT_REGS_SYSCALL_NR(regs); \ + pr_reg[12] = PT_REGS_IP(regs); \ + pr_reg[13] = PT_REGS_CS(regs); \ + pr_reg[14] = PT_REGS_EFLAGS(regs); \ + pr_reg[15] = PT_REGS_SP(regs); \ + pr_reg[16] = PT_REGS_SS(regs); \ +} while (0); + +extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); + +#define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu) + +extern long elf_aux_hwcap; +#define ELF_HWCAP (elf_aux_hwcap) + +extern char * elf_aux_platform; +#define ELF_PLATFORM (elf_aux_platform) + +#define SET_PERSONALITY(ex) do { } while (0) + +extern unsigned long vsyscall_ehdr; +extern unsigned long vsyscall_end; +extern unsigned long __kernel_vsyscall; + +#define VSYSCALL_BASE vsyscall_ehdr +#define VSYSCALL_END vsyscall_end + +/* + * This is the range that is readable by user mode, and things + * acting like user mode such as get_user_pages. + */ +#define FIXADDR_USER_START VSYSCALL_BASE +#define FIXADDR_USER_END VSYSCALL_END + +/* + * Architecture-neutral AT_ values in 0-17, leave some room + * for more of them, start the x86-specific ones at 32. + */ +#define AT_SYSINFO 32 +#define AT_SYSINFO_EHDR 33 + +#define ARCH_DLINFO \ +do { \ + if ( vsyscall_ehdr ) { \ + NEW_AUX_ENT(AT_SYSINFO, __kernel_vsyscall); \ + NEW_AUX_ENT(AT_SYSINFO_EHDR, vsyscall_ehdr); \ + } \ +} while (0) + +/* + * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out + * extra segments containing the vsyscall DSO contents. Dumping its + * contents makes post-mortem fully interpretable later without matching up + * the same kernel and hardware config to see what PC values meant. + * Dumping its extra ELF program headers includes all the other information + * a debugger needs to easily find how the vsyscall DSO was being used. + */ +#define ELF_CORE_EXTRA_PHDRS \ + (vsyscall_ehdr ? (((struct elfhdr *)vsyscall_ehdr)->e_phnum) : 0 ) + +#define ELF_CORE_WRITE_EXTRA_PHDRS \ +if ( vsyscall_ehdr ) { \ + const struct elfhdr *const ehdrp = (struct elfhdr *)vsyscall_ehdr; \ + const struct elf_phdr *const phdrp = \ + (const struct elf_phdr *) (vsyscall_ehdr + ehdrp->e_phoff); \ + int i; \ + Elf32_Off ofs = 0; \ + for (i = 0; i < ehdrp->e_phnum; ++i) { \ + struct elf_phdr phdr = phdrp[i]; \ + if (phdr.p_type == PT_LOAD) { \ + ofs = phdr.p_offset = offset; \ + offset += phdr.p_filesz; \ + } \ + else \ + phdr.p_offset += ofs; \ + phdr.p_paddr = 0; /* match other core phdrs */ \ + DUMP_WRITE(&phdr, sizeof(phdr)); \ + } \ +} +#define ELF_CORE_WRITE_EXTRA_DATA \ +if ( vsyscall_ehdr ) { \ + const struct elfhdr *const ehdrp = (struct elfhdr *)vsyscall_ehdr; \ + const struct elf_phdr *const phdrp = \ + (const struct elf_phdr *) (vsyscall_ehdr + ehdrp->e_phoff); \ + int i; \ + for (i = 0; i < ehdrp->e_phnum; ++i) { \ + if (phdrp[i].p_type == PT_LOAD) \ + DUMP_WRITE((void *) phdrp[i].p_vaddr, \ + phdrp[i].p_filesz); \ + } \ +} + +#endif diff --git a/arch/um/sys-i386/asm/module.h b/arch/um/sys-i386/asm/module.h new file mode 100644 index 0000000..5ead4a0 --- /dev/null +++ b/arch/um/sys-i386/asm/module.h @@ -0,0 +1,13 @@ +#ifndef __UM_MODULE_I386_H +#define __UM_MODULE_I386_H + +/* UML is simple */ +struct mod_arch_specific +{ +}; + +#define Elf_Shdr Elf32_Shdr +#define Elf_Sym Elf32_Sym +#define Elf_Ehdr Elf32_Ehdr + +#endif diff --git a/arch/um/sys-i386/asm/processor.h b/arch/um/sys-i386/asm/processor.h new file mode 100644 index 0000000..82a9061 --- /dev/null +++ b/arch/um/sys-i386/asm/processor.h @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) + * Licensed under the GPL + */ + +#ifndef __UM_PROCESSOR_I386_H +#define __UM_PROCESSOR_I386_H + +#include "linux/string.h" +#include <sysdep/host_ldt.h> +#include "asm/segment.h" + +extern int host_has_cmov; + +/* include faultinfo structure */ +#include "sysdep/faultinfo.h" + +struct uml_tls_struct { + struct user_desc tls; + unsigned flushed:1; + unsigned present:1; +}; + +struct arch_thread { + struct uml_tls_struct tls_array[GDT_ENTRY_TLS_ENTRIES]; + unsigned long debugregs[8]; + int debugregs_seq; + struct faultinfo faultinfo; +}; + +#define INIT_ARCH_THREAD { \ + .tls_array = { [ 0 ... GDT_ENTRY_TLS_ENTRIES - 1 ] = \ + { .present = 0, .flushed = 0 } }, \ + .debugregs = { [ 0 ... 7 ] = 0 }, \ + .debugregs_seq = 0, \ + .faultinfo = { 0, 0, 0 } \ +} + +static inline void arch_flush_thread(struct arch_thread *thread) +{ + /* Clear any TLS still hanging */ + memset(&thread->tls_array, 0, sizeof(thread->tls_array)); +} + +static inline void arch_copy_thread(struct arch_thread *from, + struct arch_thread *to) +{ + memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array)); +} + +#include <asm/user.h> + +/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ +static inline void rep_nop(void) +{ + __asm__ __volatile__("rep;nop": : :"memory"); +} + +#define cpu_relax() rep_nop() + +/* + * Default implementation of macro that returns current + * instruction pointer ("program counter"). Stolen + * from asm-i386/processor.h + */ +#define current_text_addr() \ + ({ void *pc; __asm__("movl $1f,%0\n1:":"=g" (pc)); pc; }) + +#define ARCH_IS_STACKGROW(address) \ + (address + 32 >= UPT_SP(¤t->thread.regs.regs)) + +#define KSTK_EIP(tsk) KSTK_REG(tsk, EIP) +#define KSTK_ESP(tsk) KSTK_REG(tsk, UESP) +#define KSTK_EBP(tsk) KSTK_REG(tsk, EBP) + +#include "asm/processor-generic.h" + +#endif diff --git a/arch/um/sys-i386/asm/ptrace.h b/arch/um/sys-i386/asm/ptrace.h new file mode 100644 index 0000000..0273e4d --- /dev/null +++ b/arch/um/sys-i386/asm/ptrace.h @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) + * Licensed under the GPL + */ + +#ifndef __UM_PTRACE_I386_H +#define __UM_PTRACE_I386_H + +#define HOST_AUDIT_ARCH AUDIT_ARCH_I386 + +#include "linux/compiler.h" +#include "asm/ptrace-generic.h" + +#define PT_REGS_EAX(r) UPT_EAX(&(r)->regs) +#define PT_REGS_EBX(r) UPT_EBX(&(r)->regs) +#define PT_REGS_ECX(r) UPT_ECX(&(r)->regs) +#define PT_REGS_EDX(r) UPT_EDX(&(r)->regs) +#define PT_REGS_ESI(r) UPT_ESI(&(r)->regs) +#define PT_REGS_EDI(r) UPT_EDI(&(r)->regs) +#define PT_REGS_EBP(r) UPT_EBP(&(r)->regs) + +#define PT_REGS_CS(r) UPT_CS(&(r)->regs) +#define PT_REGS_SS(r) UPT_SS(&(r)->regs) +#define PT_REGS_DS(r) UPT_DS(&(r)->regs) +#define PT_REGS_ES(r) UPT_ES(&(r)->regs) +#define PT_REGS_FS(r) UPT_FS(&(r)->regs) +#define PT_REGS_GS(r) UPT_GS(&(r)->regs) + +#define PT_REGS_EFLAGS(r) UPT_EFLAGS(&(r)->regs) + +#define PT_REGS_ORIG_SYSCALL(r) PT_REGS_EAX(r) +#define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r) +#define PT_FIX_EXEC_STACK(sp) do ; while(0) + +#define profile_pc(regs) PT_REGS_IP(regs) + +#define user_mode(r) UPT_IS_USER(&(r)->regs) + +/* + * Forward declaration to avoid including sysdep/tls.h, which causes a + * circular include, and compilation failures. + */ +struct user_desc; + +extern int get_fpxregs(struct user_fxsr_struct __user *buf, + struct task_struct *child); +extern int set_fpxregs(struct user_fxsr_struct __user *buf, + struct task_struct *tsk); + +extern int ptrace_get_thread_area(struct task_struct *child, int idx, + struct user_desc __user *user_desc); + +extern int ptrace_set_thread_area(struct task_struct *child, int idx, + struct user_desc __user *user_desc); + +#endif diff --git a/arch/um/sys-i386/sysdep/archsetjmp.h b/arch/um/sys-i386/shared/sysdep/archsetjmp.h index 0f31208..0f31208 100644 --- a/arch/um/sys-i386/sysdep/archsetjmp.h +++ b/arch/um/sys-i386/shared/sysdep/archsetjmp.h diff --git a/arch/um/sys-i386/sysdep/barrier.h b/arch/um/sys-i386/shared/sysdep/barrier.h index b58d52c..b58d52c 100644 --- a/arch/um/sys-i386/sysdep/barrier.h +++ b/arch/um/sys-i386/shared/sysdep/barrier.h diff --git a/arch/um/sys-i386/sysdep/checksum.h b/arch/um/sys-i386/shared/sysdep/checksum.h index 0cb4645..0cb4645 100644 --- a/arch/um/sys-i386/sysdep/checksum.h +++ b/arch/um/sys-i386/shared/sysdep/checksum.h diff --git a/arch/um/sys-i386/sysdep/faultinfo.h b/arch/um/sys-i386/shared/sysdep/faultinfo.h index db437cc..db437cc 100644 --- a/arch/um/sys-i386/sysdep/faultinfo.h +++ b/arch/um/sys-i386/shared/sysdep/faultinfo.h diff --git a/arch/um/sys-i386/sysdep/host_ldt.h b/arch/um/sys-i386/shared/sysdep/host_ldt.h index 0953cc4..0953cc4 100644 --- a/arch/um/sys-i386/sysdep/host_ldt.h +++ b/arch/um/sys-i386/shared/sysdep/host_ldt.h diff --git a/arch/um/sys-i386/sysdep/kernel-offsets.h b/arch/um/sys-i386/shared/sysdep/kernel-offsets.h index 5868526..5868526 100644 --- a/arch/um/sys-i386/sysdep/kernel-offsets.h +++ b/arch/um/sys-i386/shared/sysdep/kernel-offsets.h diff --git a/arch/um/sys-i386/sysdep/ptrace.h b/arch/um/sys-i386/shared/sysdep/ptrace.h index 11c0896..11c0896 100644 --- a/arch/um/sys-i386/sysdep/ptrace.h +++ b/arch/um/sys-i386/shared/sysdep/ptrace.h diff --git a/arch/um/sys-i386/sysdep/ptrace_user.h b/arch/um/sys-i386/shared/sysdep/ptrace_user.h index ef56247..ef56247 100644 --- a/arch/um/sys-i386/sysdep/ptrace_user.h +++ b/arch/um/sys-i386/shared/sysdep/ptrace_user.h diff --git a/arch/um/sys-i386/sysdep/sc.h b/arch/um/sys-i386/shared/sysdep/sc.h index c57d178..c57d178 100644 --- a/arch/um/sys-i386/sysdep/sc.h +++ b/arch/um/sys-i386/shared/sysdep/sc.h diff --git a/arch/um/sys-i386/sysdep/sigcontext.h b/arch/um/sys-i386/shared/sysdep/sigcontext.h index f583c87..f583c87 100644 --- a/arch/um/sys-i386/sysdep/sigcontext.h +++ b/arch/um/sys-i386/shared/sysdep/sigcontext.h diff --git a/arch/um/sys-i386/sysdep/skas_ptrace.h b/arch/um/sys-i386/shared/sysdep/skas_ptrace.h index e27b8a7..e27b8a7 100644 --- a/arch/um/sys-i386/sysdep/skas_ptrace.h +++ b/arch/um/sys-i386/shared/sysdep/skas_ptrace.h diff --git a/arch/um/sys-i386/sysdep/stub.h b/arch/um/sys-i386/shared/sysdep/stub.h index 8c097b8..8c097b8 100644 --- a/arch/um/sys-i386/sysdep/stub.h +++ b/arch/um/sys-i386/shared/sysdep/stub.h diff --git a/arch/um/sys-i386/sysdep/syscalls.h b/arch/um/sys-i386/shared/sysdep/syscalls.h index 9056981..9056981 100644 --- a/arch/um/sys-i386/sysdep/syscalls.h +++ b/arch/um/sys-i386/shared/sysdep/syscalls.h diff --git a/arch/um/sys-i386/sysdep/system.h b/arch/um/sys-i386/shared/sysdep/system.h index d1b93c4..d1b93c4 100644 --- a/arch/um/sys-i386/sysdep/system.h +++ b/arch/um/sys-i386/shared/sysdep/system.h diff --git a/arch/um/sys-i386/sysdep/tls.h b/arch/um/sys-i386/shared/sysdep/tls.h index 3455075..3455075 100644 --- a/arch/um/sys-i386/sysdep/tls.h +++ b/arch/um/sys-i386/shared/sysdep/tls.h diff --git a/arch/um/sys-i386/sysdep/vm-flags.h b/arch/um/sys-i386/shared/sysdep/vm-flags.h index e0d24c5..e0d24c5 100644 --- a/arch/um/sys-i386/sysdep/vm-flags.h +++ b/arch/um/sys-i386/shared/sysdep/vm-flags.h |