diff options
Diffstat (limited to 'arch/sparc/include/asm/ttable.h')
| -rw-r--r-- | arch/sparc/include/asm/ttable.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/ttable.h index 48f2807d326..71b5a67522a 100644 --- a/arch/sparc/include/asm/ttable.h +++ b/arch/sparc/include/asm/ttable.h | |||
| @@ -372,7 +372,9 @@ etrap_spill_fixup_64bit: \ | |||
| 372 | 372 | ||
| 373 | /* Normal 32bit spill */ | 373 | /* Normal 32bit spill */ |
| 374 | #define SPILL_2_GENERIC(ASI) \ | 374 | #define SPILL_2_GENERIC(ASI) \ |
| 375 | srl %sp, 0, %sp; \ | 375 | and %sp, 1, %g3; \ |
| 376 | brnz,pn %g3, (. - (128 + 4)); \ | ||
| 377 | srl %sp, 0, %sp; \ | ||
| 376 | stwa %l0, [%sp + %g0] ASI; \ | 378 | stwa %l0, [%sp + %g0] ASI; \ |
| 377 | mov 0x04, %g3; \ | 379 | mov 0x04, %g3; \ |
| 378 | stwa %l1, [%sp + %g3] ASI; \ | 380 | stwa %l1, [%sp + %g3] ASI; \ |
| @@ -398,14 +400,16 @@ etrap_spill_fixup_64bit: \ | |||
| 398 | stwa %i6, [%g1 + %g0] ASI; \ | 400 | stwa %i6, [%g1 + %g0] ASI; \ |
| 399 | stwa %i7, [%g1 + %g3] ASI; \ | 401 | stwa %i7, [%g1 + %g3] ASI; \ |
| 400 | saved; \ | 402 | saved; \ |
| 401 | retry; nop; nop; \ | 403 | retry; \ |
| 402 | b,a,pt %xcc, spill_fixup_dax; \ | 404 | b,a,pt %xcc, spill_fixup_dax; \ |
| 403 | b,a,pt %xcc, spill_fixup_mna; \ | 405 | b,a,pt %xcc, spill_fixup_mna; \ |
| 404 | b,a,pt %xcc, spill_fixup; | 406 | b,a,pt %xcc, spill_fixup; |
| 405 | 407 | ||
| 406 | #define SPILL_2_GENERIC_ETRAP \ | 408 | #define SPILL_2_GENERIC_ETRAP \ |
| 407 | etrap_user_spill_32bit: \ | 409 | etrap_user_spill_32bit: \ |
| 408 | srl %sp, 0, %sp; \ | 410 | and %sp, 1, %g3; \ |
| 411 | brnz,pn %g3, etrap_user_spill_64bit; \ | ||
| 412 | srl %sp, 0, %sp; \ | ||
| 409 | stwa %l0, [%sp + 0x00] %asi; \ | 413 | stwa %l0, [%sp + 0x00] %asi; \ |
| 410 | stwa %l1, [%sp + 0x04] %asi; \ | 414 | stwa %l1, [%sp + 0x04] %asi; \ |
| 411 | stwa %l2, [%sp + 0x08] %asi; \ | 415 | stwa %l2, [%sp + 0x08] %asi; \ |
| @@ -427,7 +431,7 @@ etrap_user_spill_32bit: \ | |||
| 427 | ba,pt %xcc, etrap_save; \ | 431 | ba,pt %xcc, etrap_save; \ |
| 428 | wrpr %g1, %cwp; \ | 432 | wrpr %g1, %cwp; \ |
| 429 | nop; nop; nop; nop; \ | 433 | nop; nop; nop; nop; \ |
| 430 | nop; nop; nop; nop; \ | 434 | nop; nop; \ |
| 431 | ba,a,pt %xcc, etrap_spill_fixup_32bit; \ | 435 | ba,a,pt %xcc, etrap_spill_fixup_32bit; \ |
| 432 | ba,a,pt %xcc, etrap_spill_fixup_32bit; \ | 436 | ba,a,pt %xcc, etrap_spill_fixup_32bit; \ |
| 433 | ba,a,pt %xcc, etrap_spill_fixup_32bit; | 437 | ba,a,pt %xcc, etrap_spill_fixup_32bit; |
| @@ -592,7 +596,9 @@ user_rtt_fill_64bit: \ | |||
| 592 | 596 | ||
| 593 | /* Normal 32bit fill */ | 597 | /* Normal 32bit fill */ |
| 594 | #define FILL_2_GENERIC(ASI) \ | 598 | #define FILL_2_GENERIC(ASI) \ |
| 595 | srl %sp, 0, %sp; \ | 599 | and %sp, 1, %g3; \ |
| 600 | brnz,pn %g3, (. - (128 + 4)); \ | ||
| 601 | srl %sp, 0, %sp; \ | ||
| 596 | lduwa [%sp + %g0] ASI, %l0; \ | 602 | lduwa [%sp + %g0] ASI, %l0; \ |
| 597 | mov 0x04, %g2; \ | 603 | mov 0x04, %g2; \ |
| 598 | mov 0x08, %g3; \ | 604 | mov 0x08, %g3; \ |
| @@ -616,14 +622,16 @@ user_rtt_fill_64bit: \ | |||
| 616 | lduwa [%g1 + %g3] ASI, %i6; \ | 622 | lduwa [%g1 + %g3] ASI, %i6; \ |
| 617 | lduwa [%g1 + %g5] ASI, %i7; \ | 623 | lduwa [%g1 + %g5] ASI, %i7; \ |
| 618 | restored; \ | 624 | restored; \ |
| 619 | retry; nop; nop; nop; nop; \ | 625 | retry; nop; nop; \ |
| 620 | b,a,pt %xcc, fill_fixup_dax; \ | 626 | b,a,pt %xcc, fill_fixup_dax; \ |
| 621 | b,a,pt %xcc, fill_fixup_mna; \ | 627 | b,a,pt %xcc, fill_fixup_mna; \ |
| 622 | b,a,pt %xcc, fill_fixup; | 628 | b,a,pt %xcc, fill_fixup; |
| 623 | 629 | ||
| 624 | #define FILL_2_GENERIC_RTRAP \ | 630 | #define FILL_2_GENERIC_RTRAP \ |
| 625 | user_rtt_fill_32bit: \ | 631 | user_rtt_fill_32bit: \ |
| 626 | srl %sp, 0, %sp; \ | 632 | and %sp, 1, %g3; \ |
| 633 | brnz,pn %g3, user_rtt_fill_64bit; \ | ||
| 634 | srl %sp, 0, %sp; \ | ||
| 627 | lduwa [%sp + 0x00] %asi, %l0; \ | 635 | lduwa [%sp + 0x00] %asi, %l0; \ |
| 628 | lduwa [%sp + 0x04] %asi, %l1; \ | 636 | lduwa [%sp + 0x04] %asi, %l1; \ |
| 629 | lduwa [%sp + 0x08] %asi, %l2; \ | 637 | lduwa [%sp + 0x08] %asi, %l2; \ |
| @@ -643,7 +651,7 @@ user_rtt_fill_32bit: \ | |||
| 643 | ba,pt %xcc, user_rtt_pre_restore; \ | 651 | ba,pt %xcc, user_rtt_pre_restore; \ |
| 644 | restored; \ | 652 | restored; \ |
| 645 | nop; nop; nop; nop; nop; \ | 653 | nop; nop; nop; nop; nop; \ |
| 646 | nop; nop; nop; nop; nop; \ | 654 | nop; nop; nop; \ |
| 647 | ba,a,pt %xcc, user_rtt_fill_fixup; \ | 655 | ba,a,pt %xcc, user_rtt_fill_fixup; \ |
| 648 | ba,a,pt %xcc, user_rtt_fill_fixup; \ | 656 | ba,a,pt %xcc, user_rtt_fill_fixup; \ |
| 649 | ba,a,pt %xcc, user_rtt_fill_fixup; | 657 | ba,a,pt %xcc, user_rtt_fill_fixup; |