Commit c5258190 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze update from Michal Simek:
 "The main change is UAPI for Microblaze."

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: signal: Declare do_notify_resume
  microblaze: lib: Add lib function declarations
  microblaze: lib: Remove helper macros
  microblaze: Add static qualifiers
  microblaze: Wire-up new system call kcmp
  microblaze: Fix intc_enable_or_unmask function
  microblaze: Do not initialized regs->r1 twice in ELF_PLAT_INIT
  microblaze: Remove passing the second arg to schedule_tail
  UAPI: (Scripted) Disintegrate arch/microblaze/include/asm
  microblaze: uaccess.h: Fix timerfd syscall
  microblaze: Remove BIP from childregs
parents 1ed55eac 4378bb69
include include/asm-generic/Kbuild.asm
header-y += elf.h
generic-y += clkdev.h generic-y += clkdev.h
generic-y += exec.h generic-y += exec.h
generic-y += trace_clock.h generic-y += trace_clock.h
......
...@@ -7,119 +7,24 @@ ...@@ -7,119 +7,24 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
*/ */
#ifndef _ASM_MICROBLAZE_ELF_H #ifndef _ASM_MICROBLAZE_ELF_H
#define _ASM_MICROBLAZE_ELF_H #define _ASM_MICROBLAZE_ELF_H
/* #include <uapi/asm/elf.h>
* Note there is no "official" ELF designation for Microblaze.
* I've snaffled the value from the microblaze binutils source code
* /binutils/microblaze/include/elf/microblaze.h
*/
#define EM_MICROBLAZE 189
#define EM_MICROBLAZE_OLD 0xbaab
#define ELF_ARCH EM_MICROBLAZE
/*
* This is used to ensure we don't load something for the wrong architecture.
*/
#define elf_check_arch(x) ((x)->e_machine == EM_MICROBLAZE \
|| (x)->e_machine == EM_MICROBLAZE_OLD)
/*
* These are used to set parameters in the core dumps.
*/
#define ELF_CLASS ELFCLASS32
#ifndef __uClinux__ #ifndef __uClinux__
/*
* ELF register definitions..
*/
#include <asm/ptrace.h>
#include <asm/byteorder.h>
#ifndef ELF_GREG_T #ifndef ELF_GREG_T
#define ELF_GREG_T
typedef unsigned long elf_greg_t;
#endif #endif
#ifndef ELF_NGREG #ifndef ELF_NGREG
#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
#endif #endif
#ifndef ELF_GREGSET_T #ifndef ELF_GREGSET_T
#define ELF_GREGSET_T
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
#endif #endif
#ifndef ELF_FPREGSET_T #ifndef ELF_FPREGSET_T
#define ELF_FPREGSET_T
/* TBD */
#define ELF_NFPREG 33 /* includes fsr */
typedef unsigned long elf_fpreg_t;
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
/* typedef struct user_fpu_struct elf_fpregset_t; */
#endif #endif
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
* use of this is to invoke "./ld.so someprog" to test out a new version of
* the loader. We need to make sure that it is out of the way of the program
* that it will "exec", and that there is sufficient room for the brk.
*/
#define ELF_ET_DYN_BASE (0x08000000)
#ifdef __MICROBLAZEEL__ #ifdef __MICROBLAZEEL__
#define ELF_DATA ELFDATA2LSB
#else #else
#define ELF_DATA ELFDATA2MSB
#endif #endif
#define ELF_EXEC_PAGESIZE PAGE_SIZE
#define ELF_CORE_COPY_REGS(_dest, _regs) \
memcpy((char *) &_dest, (char *) _regs, \
sizeof(struct pt_regs));
/* This yields a mask that user programs can use to figure out what
* instruction set this CPU supports. This could be done in user space,
* but it's not easy, and we've already done it here.
*/
#define ELF_HWCAP (0)
/* This yields a string that ld.so will use to load implementation
* specific libraries for optimization. This is more specific in
* intent than poking at uname or /proc/cpuinfo.
* For the moment, we have only optimizations for the Intel generations,
* but that could change...
*/
#define ELF_PLATFORM (NULL)
/* Added _f parameter. Is this definition correct: TBD */
#define ELF_PLAT_INIT(_r, _f) \
do { \
_r->r1 = _r->r1 = _r->r2 = _r->r3 = \
_r->r4 = _r->r5 = _r->r6 = _r->r7 = \
_r->r8 = _r->r9 = _r->r10 = _r->r11 = \
_r->r12 = _r->r13 = _r->r14 = _r->r15 = \
_r->r16 = _r->r17 = _r->r18 = _r->r19 = \
_r->r20 = _r->r21 = _r->r22 = _r->r23 = \
_r->r24 = _r->r25 = _r->r26 = _r->r27 = \
_r->r28 = _r->r29 = _r->r30 = _r->r31 = \
0; \
} while (0)
#ifdef __KERNEL__
#define SET_PERSONALITY(ex) \ #define SET_PERSONALITY(ex) \
set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK))) set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK)))
#endif
#endif /* __uClinux__ */ #endif /* __uClinux__ */
#endif /* _ASM_MICROBLAZE_ELF_H */ #endif /* _ASM_MICROBLAZE_ELF_H */
...@@ -29,6 +29,8 @@ DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */ ...@@ -29,6 +29,8 @@ DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */
DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */ DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */
DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */ DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */
DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */ DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */
extern asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall);
# endif /* __ASSEMBLY__ */ # endif /* __ASSEMBLY__ */
#endif /* _ASM_MICROBLAZE_ENTRY_H */ #endif /* _ASM_MICROBLAZE_ENTRY_H */
...@@ -5,56 +5,12 @@ ...@@ -5,56 +5,12 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
*/ */
#ifndef _ASM_MICROBLAZE_PTRACE_H #ifndef _ASM_MICROBLAZE_PTRACE_H
#define _ASM_MICROBLAZE_PTRACE_H #define _ASM_MICROBLAZE_PTRACE_H
#ifndef __ASSEMBLY__ #include <uapi/asm/ptrace.h>
typedef unsigned long microblaze_reg_t;
struct pt_regs { #ifndef __ASSEMBLY__
microblaze_reg_t r0;
microblaze_reg_t r1;
microblaze_reg_t r2;
microblaze_reg_t r3;
microblaze_reg_t r4;
microblaze_reg_t r5;
microblaze_reg_t r6;
microblaze_reg_t r7;
microblaze_reg_t r8;
microblaze_reg_t r9;
microblaze_reg_t r10;
microblaze_reg_t r11;
microblaze_reg_t r12;
microblaze_reg_t r13;
microblaze_reg_t r14;
microblaze_reg_t r15;
microblaze_reg_t r16;
microblaze_reg_t r17;
microblaze_reg_t r18;
microblaze_reg_t r19;
microblaze_reg_t r20;
microblaze_reg_t r21;
microblaze_reg_t r22;
microblaze_reg_t r23;
microblaze_reg_t r24;
microblaze_reg_t r25;
microblaze_reg_t r26;
microblaze_reg_t r27;
microblaze_reg_t r28;
microblaze_reg_t r29;
microblaze_reg_t r30;
microblaze_reg_t r31;
microblaze_reg_t pc;
microblaze_reg_t msr;
microblaze_reg_t ear;
microblaze_reg_t esr;
microblaze_reg_t fsr;
int pt_mode;
};
#ifdef __KERNEL__
#define kernel_mode(regs) ((regs)->pt_mode) #define kernel_mode(regs) ((regs)->pt_mode)
#define user_mode(regs) (!kernel_mode(regs)) #define user_mode(regs) (!kernel_mode(regs))
...@@ -66,19 +22,5 @@ static inline long regs_return_value(struct pt_regs *regs) ...@@ -66,19 +22,5 @@ static inline long regs_return_value(struct pt_regs *regs)
return regs->r3; return regs->r3;
} }
#else /* __KERNEL__ */
/* pt_regs offsets used by gdbserver etc in ptrace syscalls */
#define PT_GPR(n) ((n) * sizeof(microblaze_reg_t))
#define PT_PC (32 * sizeof(microblaze_reg_t))
#define PT_MSR (33 * sizeof(microblaze_reg_t))
#define PT_EAR (34 * sizeof(microblaze_reg_t))
#define PT_ESR (35 * sizeof(microblaze_reg_t))
#define PT_FSR (36 * sizeof(microblaze_reg_t))
#define PT_KERNEL_MODE (37 * sizeof(microblaze_reg_t))
#endif /* __KERNEL */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _ASM_MICROBLAZE_PTRACE_H */ #endif /* _ASM_MICROBLAZE_PTRACE_H */
...@@ -7,15 +7,12 @@ ...@@ -7,15 +7,12 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
*/ */
#ifndef _ASM_MICROBLAZE_SETUP_H #ifndef _ASM_MICROBLAZE_SETUP_H
#define _ASM_MICROBLAZE_SETUP_H #define _ASM_MICROBLAZE_SETUP_H
#define COMMAND_LINE_SIZE 256 #include <uapi/asm/setup.h>
# ifndef __ASSEMBLY__ # ifndef __ASSEMBLY__
# ifdef __KERNEL__
extern unsigned int boot_cpuid; /* move to smp.h */ extern unsigned int boot_cpuid; /* move to smp.h */
extern char cmd_line[COMMAND_LINE_SIZE]; extern char cmd_line[COMMAND_LINE_SIZE];
...@@ -53,6 +50,5 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end); ...@@ -53,6 +50,5 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end);
extern void *alloc_maybe_bootmem(size_t size, gfp_t mask); extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
# endif/* __KERNEL__ */
# endif /* __ASSEMBLY__ */ # endif /* __ASSEMBLY__ */
#endif /* _ASM_MICROBLAZE_SETUP_H */ #endif /* _ASM_MICROBLAZE_SETUP_H */
...@@ -298,11 +298,10 @@ extern long __user_bad(void); ...@@ -298,11 +298,10 @@ extern long __user_bad(void);
#define __put_user_check(x, ptr, size) \ #define __put_user_check(x, ptr, size) \
({ \ ({ \
typeof(*(ptr)) __pu_val; \ typeof(*(ptr)) volatile __pu_val = x; \
typeof(*(ptr)) __user *__pu_addr = (ptr); \ typeof(*(ptr)) __user *__pu_addr = (ptr); \
int __pu_err = 0; \ int __pu_err = 0; \
\ \
__pu_val = (x); \
if (access_ok(VERIFY_WRITE, __pu_addr, size)) { \ if (access_ok(VERIFY_WRITE, __pu_addr, size)) { \
switch (size) { \ switch (size) { \
case 1: \ case 1: \
......
This diff is collapsed.
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
header-y += auxvec.h
header-y += bitsperlong.h
header-y += byteorder.h
header-y += elf.h
header-y += errno.h
header-y += fcntl.h
header-y += ioctl.h
header-y += ioctls.h
header-y += ipcbuf.h
header-y += kvm_para.h
header-y += mman.h
header-y += msgbuf.h
header-y += param.h
header-y += poll.h
header-y += posix_types.h
header-y += ptrace.h
header-y += resource.h
header-y += sembuf.h
header-y += setup.h
header-y += shmbuf.h
header-y += sigcontext.h
header-y += siginfo.h
header-y += signal.h
header-y += socket.h
header-y += sockios.h
header-y += stat.h
header-y += statfs.h
header-y += swab.h
header-y += termbits.h
header-y += termios.h
header-y += types.h
header-y += unistd.h
/*
* Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2008-2009 PetaLogix
* Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
#ifndef _UAPI_ASM_MICROBLAZE_ELF_H
#define _UAPI_ASM_MICROBLAZE_ELF_H
/*
* Note there is no "official" ELF designation for Microblaze.
* I've snaffled the value from the microblaze binutils source code
* /binutils/microblaze/include/elf/microblaze.h
*/
#define EM_MICROBLAZE 189
#define EM_MICROBLAZE_OLD 0xbaab
#define ELF_ARCH EM_MICROBLAZE
/*
* This is used to ensure we don't load something for the wrong architecture.
*/
#define elf_check_arch(x) ((x)->e_machine == EM_MICROBLAZE \
|| (x)->e_machine == EM_MICROBLAZE_OLD)
/*
* These are used to set parameters in the core dumps.
*/
#define ELF_CLASS ELFCLASS32
#ifndef __uClinux__
/*
* ELF register definitions..
*/
#include <asm/ptrace.h>
#include <asm/byteorder.h>
#ifndef ELF_GREG_T
#define ELF_GREG_T
typedef unsigned long elf_greg_t;
#endif
#ifndef ELF_NGREG
#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
#endif
#ifndef ELF_GREGSET_T
#define ELF_GREGSET_T
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
#endif
#ifndef ELF_FPREGSET_T
#define ELF_FPREGSET_T
/* TBD */
#define ELF_NFPREG 33 /* includes fsr */
typedef unsigned long elf_fpreg_t;
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
/* typedef struct user_fpu_struct elf_fpregset_t; */
#endif
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
* use of this is to invoke "./ld.so someprog" to test out a new version of
* the loader. We need to make sure that it is out of the way of the program
* that it will "exec", and that there is sufficient room for the brk.
*/
#define ELF_ET_DYN_BASE (0x08000000)
#ifdef __MICROBLAZEEL__
#define ELF_DATA ELFDATA2LSB
#else
#define ELF_DATA ELFDATA2MSB
#endif
#define ELF_EXEC_PAGESIZE PAGE_SIZE
#define ELF_CORE_COPY_REGS(_dest, _regs) \
memcpy((char *) &_dest, (char *) _regs, \
sizeof(struct pt_regs));
/* This yields a mask that user programs can use to figure out what
* instruction set this CPU supports. This could be done in user space,
* but it's not easy, and we've already done it here.
*/
#define ELF_HWCAP (0)
/* This yields a string that ld.so will use to load implementation
* specific libraries for optimization. This is more specific in
* intent than poking at uname or /proc/cpuinfo.
* For the moment, we have only optimizations for the Intel generations,
* but that could change...
*/
#define ELF_PLATFORM (NULL)
/* Added _f parameter. Is this definition correct: TBD */
#define ELF_PLAT_INIT(_r, _f) \
do { \
_r->r0 = _r->r1 = _r->r2 = _r->r3 = \
_r->r4 = _r->r5 = _r->r6 = _r->r7 = \
_r->r8 = _r->r9 = _r->r10 = _r->r11 = \
_r->r12 = _r->r13 = _r->r14 = _r->r15 = \
_r->r16 = _r->r17 = _r->r18 = _r->r19 = \
_r->r20 = _r->r21 = _r->r22 = _r->r23 = \
_r->r24 = _r->r25 = _r->r26 = _r->r27 = \
_r->r28 = _r->r29 = _r->r30 = _r->r31 = \
0; \
} while (0)
#endif /* __uClinux__ */
#endif /* _UAPI_ASM_MICROBLAZE_ELF_H */
/*
* Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
#ifndef _UAPI_ASM_MICROBLAZE_PTRACE_H
#define _UAPI_ASM_MICROBLAZE_PTRACE_H
#ifndef __ASSEMBLY__
typedef unsigned long microblaze_reg_t;
struct pt_regs {
microblaze_reg_t r0;
microblaze_reg_t r1;
microblaze_reg_t r2;
microblaze_reg_t r3;
microblaze_reg_t r4;
microblaze_reg_t r5;
microblaze_reg_t r6;
microblaze_reg_t r7;
microblaze_reg_t r8;
microblaze_reg_t r9;
microblaze_reg_t r10;
microblaze_reg_t r11;
microblaze_reg_t r12;
microblaze_reg_t r13;
microblaze_reg_t r14;
microblaze_reg_t r15;
microblaze_reg_t r16;
microblaze_reg_t r17;
microblaze_reg_t r18;
microblaze_reg_t r19;
microblaze_reg_t r20;
microblaze_reg_t r21;
microblaze_reg_t r22;
microblaze_reg_t r23;
microblaze_reg_t r24;
microblaze_reg_t r25;
microblaze_reg_t r26;
microblaze_reg_t r27;
microblaze_reg_t r28;
microblaze_reg_t r29;
microblaze_reg_t r30;
microblaze_reg_t r31;
microblaze_reg_t pc;
microblaze_reg_t msr;
microblaze_reg_t ear;
microblaze_reg_t esr;
microblaze_reg_t fsr;
int pt_mode;
};
#ifndef __KERNEL__
/* pt_regs offsets used by gdbserver etc in ptrace syscalls */
#define PT_GPR(n) ((n) * sizeof(microblaze_reg_t))
#define PT_PC (32 * sizeof(microblaze_reg_t))
#define PT_MSR (33 * sizeof(microblaze_reg_t))
#define PT_EAR (34 * sizeof(microblaze_reg_t))
#define PT_ESR (35 * sizeof(microblaze_reg_t))
#define PT_FSR (36 * sizeof(microblaze_reg_t))
#define PT_KERNEL_MODE (37 * sizeof(microblaze_reg_t))
#endif /* __KERNEL */
#endif /* __ASSEMBLY__ */
#endif /* _UAPI_ASM_MICROBLAZE_PTRACE_H */
/*
* Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2007-2009 PetaLogix
* Copyright (C) 2006 Atmark Techno, Inc.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
#ifndef _UAPI_ASM_MICROBLAZE_SETUP_H
#define _UAPI_ASM_MICROBLAZE_SETUP_H
#define COMMAND_LINE_SIZE 256
# ifndef __ASSEMBLY__
# endif /* __ASSEMBLY__ */
#endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */
This diff is collapsed.
...@@ -465,7 +465,6 @@ ENTRY(_switch_to) ...@@ -465,7 +465,6 @@ ENTRY(_switch_to)
ENTRY(ret_from_fork) ENTRY(ret_from_fork)
addk r5, r0, r3 addk r5, r0, r3
addk r6, r0, r1
brlid r15, schedule_tail brlid r15, schedule_tail
nop nop
swi r31, r1, PT_R31 /* save r31 in user context. */ swi r31, r1, PT_R31 /* save r31 in user context. */
......
...@@ -44,7 +44,6 @@ static void intc_enable_or_unmask(struct irq_data *d) ...@@ -44,7 +44,6 @@ static void intc_enable_or_unmask(struct irq_data *d)
unsigned long mask = 1 << d->hwirq; unsigned long mask = 1 << d->hwirq;
pr_debug("enable_or_unmask: %ld\n", d->hwirq); pr_debug("enable_or_unmask: %ld\n", d->hwirq);
out_be32(INTC_BASE + SIE, mask);
/* ack level irqs because they can't be acked during /* ack level irqs because they can't be acked during
* ack function since the handle_level_irq function * ack function since the handle_level_irq function
...@@ -52,6 +51,8 @@ static void intc_enable_or_unmask(struct irq_data *d) ...@@ -52,6 +51,8 @@ static void intc_enable_or_unmask(struct irq_data *d)
*/ */
if (irqd_is_level_type(d)) if (irqd_is_level_type(d))
out_be32(INTC_BASE + IAR, mask); out_be32(INTC_BASE + IAR, mask);
out_be32(INTC_BASE + SIE, mask);
} }
static void intc_disable_or_mask(struct irq_data *d) static void intc_disable_or_mask(struct irq_data *d)
...@@ -98,7 +99,7 @@ unsigned int get_irq(void) ...@@ -98,7 +99,7 @@ unsigned int get_irq(void)
return irq; return irq;
} }
int xintc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) static int xintc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
{ {
u32 intr_mask = (u32)d->host_data; u32 intr_mask = (u32)d->host_data;
......
...@@ -162,7 +162,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, ...@@ -162,7 +162,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
* excepting for VM and UMS * excepting for VM and UMS
* don't touch UMS , CARRY and cache bits * don't touch UMS , CARRY and cache bits
* right now MSR is a copy of parent one */ * right now MSR is a copy of parent one */
childregs->msr |= MSR_BIP;
childregs->msr &= ~MSR_EIP; childregs->msr &= ~MSR_EIP;
childregs->msr |= MSR_IE; childregs->msr |= MSR_IE;
childregs->msr &= ~MSR_VM; childregs->msr &= ~MSR_VM;
......
...@@ -52,9 +52,9 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) ...@@ -52,9 +52,9 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
} }
#ifdef CONFIG_EARLY_PRINTK #ifdef CONFIG_EARLY_PRINTK
char *stdout; static char *stdout;
int __init early_init_dt_scan_chosen_serial(unsigned long node, static int __init early_init_dt_scan_chosen_serial(unsigned long node,
const char *uname, int depth, void *data) const char *uname, int depth, void *data)
{ {
unsigned long l; unsigned long l;
......
...@@ -354,7 +354,7 @@ static void do_signal(struct pt_regs *regs, int in_syscall) ...@@ -354,7 +354,7 @@ static void do_signal(struct pt_regs *regs, int in_syscall)
restore_saved_sigmask(); restore_saved_sigmask();
} }
void do_notify_resume(struct pt_regs *regs, int in_syscall) asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall)
{ {
/* /*
* We want the common case to go fast, which * We want the common case to go fast, which
......
...@@ -379,3 +379,4 @@ ENTRY(sys_call_table) ...@@ -379,3 +379,4 @@ ENTRY(sys_call_table)
.long sys_sendmmsg .long sys_sendmmsg
.long sys_process_vm_readv .long sys_process_vm_readv
.long sys_process_vm_writev .long sys_process_vm_writev
.long sys_kcmp
...@@ -22,4 +22,11 @@ typedef union { ...@@ -22,4 +22,11 @@ typedef union {
long long ll; long long ll;
} DWunion; } DWunion;
extern long long __ashldi3(long long u, word_type b);
extern long long __ashrdi3(long long u, word_type b);
extern word_type __cmpdi2(long long a, long long b);
extern long long __lshrdi3(long long u, word_type b);
extern long long __muldi3(long long u, long long v);
extern word_type __ucmpdi2(unsigned long long a, unsigned long long b);
#endif /* __ASM_LIBGCC_H */ #endif /* __ASM_LIBGCC_H */
...@@ -2,32 +2,28 @@ ...@@ -2,32 +2,28 @@
#include "libgcc.h" #include "libgcc.h"
#define DWtype long long
#define UWtype unsigned long
#define UHWtype unsigned short
#define W_TYPE_SIZE 32 #define W_TYPE_SIZE 32
#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2)) #define __ll_B ((unsigned long) 1 << (W_TYPE_SIZE / 2))
#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1)) #define __ll_lowpart(t) ((unsigned long) (t) & (__ll_B - 1))
#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2)) #define __ll_highpart(t) ((unsigned long) (t) >> (W_TYPE_SIZE / 2))
/* If we still don't have umul_ppmm, define it using plain C. */ /* If we still don't have umul_ppmm, define it using plain C. */
#if !defined(umul_ppmm) #if !defined(umul_ppmm)
#define umul_ppmm(w1, w0, u, v) \ #define umul_ppmm(w1, w0, u, v) \
do { \ do { \
UWtype __x0, __x1, __x2, __x3; \ unsigned long __x0, __x1, __x2, __x3; \
UHWtype __ul, __vl, __uh, __vh; \ unsigned short __ul, __vl, __uh, __vh; \
\ \
__ul = __ll_lowpart(u); \ __ul = __ll_lowpart(u); \
__uh = __ll_highpart(u); \ __uh = __ll_highpart(u); \
__vl = __ll_lowpart(v); \ __vl = __ll_lowpart(v); \
__vh = __ll_highpart(v); \ __vh = __ll_highpart(v); \
\ \
__x0 = (UWtype) __ul * __vl; \ __x0 = (unsigned long) __ul * __vl; \
__x1 = (UWtype) __ul * __vh; \ __x1 = (unsigned long) __ul * __vh; \
__x2 = (UWtype) __uh * __vl; \ __x2 = (unsigned long) __uh * __vl; \
__x3 = (UWtype) __uh * __vh; \ __x3 = (unsigned long) __uh * __vh; \
\ \
__x1 += __ll_highpart(__x0); /* this can't give carry */\ __x1 += __ll_highpart(__x0); /* this can't give carry */\
__x1 += __x2; /* but this indeed can */ \ __x1 += __x2; /* but this indeed can */ \
...@@ -47,14 +43,14 @@ ...@@ -47,14 +43,14 @@
}) })
#endif #endif
DWtype __muldi3(DWtype u, DWtype v) long long __muldi3(long long u, long long v)
{ {
const DWunion uu = {.ll = u}; const DWunion uu = {.ll = u};
const DWunion vv = {.ll = v}; const DWunion vv = {.ll = v};
DWunion w = {.ll = __umulsidi3(uu.s.low, vv.s.low)}; DWunion w = {.ll = __umulsidi3(uu.s.low, vv.s.low)};
w.s.high += ((UWtype) uu.s.low * (UWtype) vv.s.high w.s.high += ((unsigned long) uu.s.low * (unsigned long) vv.s.high
+ (UWtype) uu.s.high * (UWtype) vv.s.low); + (unsigned long) uu.s.high * (unsigned long) vv.s.low);
return w.ll; return w.ll;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment