diff options
Diffstat (limited to 'arch/arm/vfp/entry.S')
| -rw-r--r-- | arch/arm/vfp/entry.S | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S index 806ce26d524..fe6ca574d09 100644 --- a/arch/arm/vfp/entry.S +++ b/arch/arm/vfp/entry.S @@ -7,32 +7,37 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. - * - * Basic entry code, called from the kernel's undefined instruction trap. - * r0 = faulted instruction - * r5 = faulted PC+4 - * r9 = successful return - * r10 = thread_info structure - * lr = failure return */ -#include <linux/linkage.h> #include <linux/init.h> -#include <asm/asm-offsets.h> -#include <asm/assembler.h> +#include <linux/linkage.h> +#include <asm/thread_info.h> #include <asm/vfpmacros.h> +#include <asm/assembler.h> +#include <asm/asm-offsets.h> - .globl do_vfp -do_vfp: - enable_irq +@ VFP entry point. +@ +@ r0 = instruction opcode (32-bit ARM or two 16-bit Thumb) +@ r2 = PC value to resume execution after successful emulation +@ r9 = normal "successful" return address +@ r10 = this threads thread_info structure +@ lr = unrecognised instruction return address +@ IRQs enabled. +@ +ENTRY(do_vfp) + inc_preempt_count r10, r4 ldr r4, .LCvfp ldr r11, [r10, #TI_CPU] @ CPU number add r10, r10, #TI_VFPSTATE @ r10 = workspace ldr pc, [r4] @ call VFP entry point +ENDPROC(do_vfp) ENTRY(vfp_null_entry) + dec_preempt_count_ti r10, r4 mov pc, lr ENDPROC(vfp_null_entry) + .align 2 .LCvfp: .word vfp_vector @@ -40,12 +45,14 @@ ENDPROC(vfp_null_entry) @ failure to the VFP initialisation code. __INIT - .globl vfp_testing_entry -vfp_testing_entry: +ENTRY(vfp_testing_entry) + dec_preempt_count_ti r10, r4 ldr r0, VFP_arch_address - str r5, [r0] @ known non-zero value + str r0, [r0] @ set to non-zero value mov pc, r9 @ we have handled the fault +ENDPROC(vfp_testing_entry) + .align 2 VFP_arch_address: .word VFP_arch |