diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:54 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:54 -0700 |
| commit | 0e4f19b4e5d6c4801d0ee2c26a5850de1b44f4af (patch) | |
| tree | cbd277d85dedfe2f64b94c5e385b311e2c017137 /arch/sparc/include/asm/visasm.h | |
| parent | 59255ac55ba6ecd195ef97c6bcd1303a7f838c94 (diff) | |
| parent | 4d869de174c78ae29ca91b41581367c8092d933d (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-rtlsk-v3.10-16.03-rtlsk-v3.10-16.02-rtlsk-v3.10-16.01-rtlsk-v3.10-15.12-rtlsk-v3.10-15.11-rtlsk-v3.10-15.10-rtlsk-v3.10-15.09-rtlinux-linaro-lsk-v3.10-rt
Diffstat (limited to 'arch/sparc/include/asm/visasm.h')
| -rw-r--r-- | arch/sparc/include/asm/visasm.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/sparc/include/asm/visasm.h b/arch/sparc/include/asm/visasm.h index 39ca301920db..50d6f16a1513 100644 --- a/arch/sparc/include/asm/visasm.h +++ b/arch/sparc/include/asm/visasm.h @@ -28,18 +28,20 @@ * Must preserve %o5 between VISEntryHalf and VISExitHalf */ #define VISEntryHalf \ + VISEntry + +#define VISExitHalf \ + VISExit + +#define VISEntryHalfFast(fail_label) \ rd %fprs, %o5; \ andcc %o5, FPRS_FEF, %g0; \ be,pt %icc, 297f; \ - sethi %hi(298f), %g7; \ - sethi %hi(VISenterhalf), %g1; \ - jmpl %g1 + %lo(VISenterhalf), %g0; \ - or %g7, %lo(298f), %g7; \ - clr %o5; \ -297: wr %o5, FPRS_FEF, %fprs; \ -298: + nop; \ + ba,a,pt %xcc, fail_label; \ +297: wr %o5, FPRS_FEF, %fprs; -#define VISExitHalf \ +#define VISExitHalfFast \ wr %o5, 0, %fprs; #ifndef __ASSEMBLY__ |