Skip to content

Commit

Permalink
ARM: vfp: rename check_exception to vfp_hw_state_valid
Browse files Browse the repository at this point in the history
Rename this branch to more accurately reflect why its taken, rather
than what the following code does.  It is the only caller of this code.
This helps to clarify following changes, yet this change results in no
actual code change.

Document the VFP hardware state at the target of this branch.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jul 9, 2011
1 parent af61bdf commit 08409c3
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/arm/vfp/vfphw.S
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,8 @@ ENTRY(vfp_support_entry)
orr r1, r1, #FPEXC_EN @ user FPEXC has the enable bit set
ldr r4, [r3, r11, lsl #2] @ vfp_current_hw_state pointer
bic r5, r1, #FPEXC_EX @ make sure exceptions are disabled
cmp r4, r10
beq check_for_exception @ we are returning to the same
@ process, so the registers are
@ still there. In this case, we do
@ not want to drop a pending exception.
cmp r4, r10 @ this thread owns the hw context?
beq vfp_hw_state_valid

VFPFMXR FPEXC, r5 @ enable VFP, disable any pending
@ exceptions, so we can get at the
Expand Down Expand Up @@ -132,7 +129,8 @@ no_old_VFP_process:
#endif
VFPFMXR FPSCR, r5 @ restore status

check_for_exception:
@ The context stored in the VFP hardware is up to date with this thread
vfp_hw_state_valid:
tst r1, #FPEXC_EX
bne process_exception @ might as well handle the pending
@ exception before retrying branch
Expand Down

0 comments on commit 08409c3

Please sign in to comment.