aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/kernel
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-07-28 06:40:02 -0400
committerMichal Simek <monstr@monstr.eu>2010-08-04 04:22:47 -0400
commitb9ea77e2d37013a4e66c9dad2e629998ff300608 (patch)
treefc5346c5ccfcfdc9b1ba825265534ffab36f15d2 /arch/microblaze/kernel
parentbe304350ddba60813f8703c481380752ebfd93f9 (diff)
microblaze: trivial: Use la insted of addik
la is translated to addik by toolchain. Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel')
-rw-r--r--arch/microblaze/kernel/entry.S64
1 files changed, 32 insertions, 32 deletions
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index ed9a331da24f..3fee82d6e9a2 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -368,7 +368,7 @@ C_ENTRY(_user_exception):
368 # Find and jump into the syscall handler. 368 # Find and jump into the syscall handler.
369 lwi r12, r12, sys_call_table 369 lwi r12, r12, sys_call_table
370 /* where the trap should return need -8 to adjust for rtsd r15, 8 */ 370 /* where the trap should return need -8 to adjust for rtsd r15, 8 */
371 la r15, r0, ret_from_trap-8 371 addi r15, r0, ret_from_trap-8
372 bra r12 372 bra r12
373 373
374 /* The syscall number is invalid, return an error. */ 374 /* The syscall number is invalid, return an error. */
@@ -416,7 +416,7 @@ C_ENTRY(ret_from_trap):
416 andi r11, r11, _TIF_SIGPENDING; 416 andi r11, r11, _TIF_SIGPENDING;
417 beqi r11, 1f; /* Signals to handle, handle them */ 417 beqi r11, 1f; /* Signals to handle, handle them */
418 418
419 la r5, r1, PTO; /* Arg 1: struct pt_regs *regs */ 419 addik r5, r1, PTO; /* Arg 1: struct pt_regs *regs */
420 addi r7, r0, 1; /* Arg 3: int in_syscall */ 420 addi r7, r0, 1; /* Arg 3: int in_syscall */
421 bralid r15, do_signal; /* Handle any signals */ 421 bralid r15, do_signal; /* Handle any signals */
422 add r6, r0, r0; /* Arg 2: sigset_t *oldset */ 422 add r6, r0, r0; /* Arg 2: sigset_t *oldset */
@@ -450,7 +450,7 @@ TRAP_return: /* Make global symbol for debugging */
450C_ENTRY(sys_fork_wrapper): 450C_ENTRY(sys_fork_wrapper):
451 addi r5, r0, SIGCHLD /* Arg 0: flags */ 451 addi r5, r0, SIGCHLD /* Arg 0: flags */
452 lwi r6, r1, PTO+PT_R1 /* Arg 1: child SP (use parent's) */ 452 lwi r6, r1, PTO+PT_R1 /* Arg 1: child SP (use parent's) */
453 la r7, r1, PTO /* Arg 2: parent context */ 453 addik r7, r1, PTO /* Arg 2: parent context */
454 add r8. r0, r0 /* Arg 3: (unused) */ 454 add r8. r0, r0 /* Arg 3: (unused) */
455 add r9, r0, r0; /* Arg 4: (unused) */ 455 add r9, r0, r0; /* Arg 4: (unused) */
456 add r10, r0, r0; /* Arg 5: (unused) */ 456 add r10, r0, r0; /* Arg 5: (unused) */
@@ -472,27 +472,27 @@ C_ENTRY(ret_from_fork):
472 472
473C_ENTRY(sys_vfork): 473C_ENTRY(sys_vfork):
474 brid microblaze_vfork /* Do real work (tail-call) */ 474 brid microblaze_vfork /* Do real work (tail-call) */
475 la r5, r1, PTO 475 addik r5, r1, PTO
476 476
477C_ENTRY(sys_clone): 477C_ENTRY(sys_clone):
478 bnei r6, 1f; /* See if child SP arg (arg 1) is 0. */ 478 bnei r6, 1f; /* See if child SP arg (arg 1) is 0. */
479 lwi r6, r1, PTO + PT_R1; /* If so, use paret's stack ptr */ 479 lwi r6, r1, PTO + PT_R1; /* If so, use paret's stack ptr */
4801: add r10, r0, r9; /* Arg 6: (child_tidptr) */ 4801: addik r7, r1, PTO; /* Arg 2: parent context */
481 add r9, r0, r8; /* Arg 5: (parent_tidptr) */ 481 add r8, r0, r0; /* Arg 3: (unused) */
482 add r8, r0, r7; /* Arg 4: (stack_size) */ 482 add r9, r0, r0; /* Arg 4: (unused) */
483 la r7, r1, PTO; /* Arg 3: pt_regs */ 483 add r10, r0, r0; /* Arg 5: (unused) */
484 brid do_fork /* Do real work (tail-call) */ 484 brid do_fork /* Do real work (tail-call) */
485 nop 485 nop;
486 486
487C_ENTRY(sys_execve): 487C_ENTRY(sys_execve):
488 la r8, r1, PTO; /* add user context as 4th arg */ 488 addik r8, r1, PTO; /* add user context as 4th arg */
489 brid microblaze_execve; /* Do real work (tail-call).*/ 489 brid microblaze_execve; /* Do real work (tail-call).*/
490 nop; 490 nop;
491 491
492C_ENTRY(sys_rt_sigreturn_wrapper): 492C_ENTRY(sys_rt_sigreturn_wrapper):
493 swi r3, r1, PTO+PT_R3; /* restore saved r3, r4 registers */ 493 swi r3, r1, PTO+PT_R3; /* restore saved r3, r4 registers */
494 swi r4, r1, PTO+PT_R4; 494 swi r4, r1, PTO+PT_R4;
495 la r5, r1, PTO; /* add user context as 1st arg */ 495 addik r5, r1, PTO; /* add user context as 1st arg */
496 brlid r15, sys_rt_sigreturn /* Do real work */ 496 brlid r15, sys_rt_sigreturn /* Do real work */
497 nop; 497 nop;
498 lwi r3, r1, PTO+PT_R3; /* restore saved r3, r4 registers */ 498 lwi r3, r1, PTO+PT_R3; /* restore saved r3, r4 registers */
@@ -559,15 +559,15 @@ C_ENTRY(full_exception_trap):
559 /* FIXME this can be store directly in PT_ESR reg. 559 /* FIXME this can be store directly in PT_ESR reg.
560 * I tested it but there is a fault */ 560 * I tested it but there is a fault */
561 /* where the trap should return need -8 to adjust for rtsd r15, 8 */ 561 /* where the trap should return need -8 to adjust for rtsd r15, 8 */
562 la r15, r0, ret_from_exc - 8 562 addik r15, r0, ret_from_exc - 8
563 la r5, r1, PTO /* parameter struct pt_regs * regs */ 563 addik r5, r1, PTO /* parameter struct pt_regs * regs */
564 mfs r6, resr 564 mfs r6, resr
565 nop 565 nop
566 mfs r7, rfsr; /* save FSR */ 566 mfs r7, rfsr; /* save FSR */
567 nop 567 nop
568 mts rfsr, r0; /* Clear sticky fsr */ 568 mts rfsr, r0; /* Clear sticky fsr */
569 nop 569 nop
570 la r12, r0, full_exception 570 addik r12, r0, full_exception
571 set_vms; 571 set_vms;
572 rtbd r12, 0; 572 rtbd r12, 0;
573 nop; 573 nop;
@@ -585,13 +585,13 @@ C_ENTRY(full_exception_trap):
585C_ENTRY(unaligned_data_trap): 585C_ENTRY(unaligned_data_trap):
586 SAVE_STATE /* Save registers.*/ 586 SAVE_STATE /* Save registers.*/
587 /* where the trap should return need -8 to adjust for rtsd r15, 8 */ 587 /* where the trap should return need -8 to adjust for rtsd r15, 8 */
588 la r15, r0, ret_from_exc-8 588 addik r15, r0, ret_from_exc-8
589 mfs r3, resr /* ESR */ 589 mfs r3, resr /* ESR */
590 nop 590 nop
591 mfs r4, rear /* EAR */ 591 mfs r4, rear /* EAR */
592 nop 592 nop
593 la r7, r1, PTO /* parameter struct pt_regs * regs */ 593 addik r7, r1, PTO /* parameter struct pt_regs * regs */
594 la r12, r0, _unaligned_data_exception 594 addik r12, r0, _unaligned_data_exception
595 set_vms; 595 set_vms;
596 rtbd r12, 0; /* interrupts enabled */ 596 rtbd r12, 0; /* interrupts enabled */
597 nop; 597 nop;
@@ -617,13 +617,13 @@ C_ENTRY(unaligned_data_trap):
617C_ENTRY(page_fault_data_trap): 617C_ENTRY(page_fault_data_trap):
618 SAVE_STATE /* Save registers.*/ 618 SAVE_STATE /* Save registers.*/
619 /* where the trap should return need -8 to adjust for rtsd r15, 8 */ 619 /* where the trap should return need -8 to adjust for rtsd r15, 8 */
620 la r15, r0, ret_from_exc-8 620 addik r15, r0, ret_from_exc-8
621 la r5, r1, PTO /* parameter struct pt_regs * regs */ 621 addik r5, r1, PTO /* parameter struct pt_regs * regs */
622 mfs r6, rear /* parameter unsigned long address */ 622 mfs r6, rear /* parameter unsigned long address */
623 nop 623 nop
624 mfs r7, resr /* parameter unsigned long error_code */ 624 mfs r7, resr /* parameter unsigned long error_code */
625 nop 625 nop
626 la r12, r0, do_page_fault 626 addik r12, r0, do_page_fault
627 set_vms; 627 set_vms;
628 rtbd r12, 0; /* interrupts enabled */ 628 rtbd r12, 0; /* interrupts enabled */
629 nop; 629 nop;
@@ -631,12 +631,12 @@ C_ENTRY(page_fault_data_trap):
631C_ENTRY(page_fault_instr_trap): 631C_ENTRY(page_fault_instr_trap):
632 SAVE_STATE /* Save registers.*/ 632 SAVE_STATE /* Save registers.*/
633 /* where the trap should return need -8 to adjust for rtsd r15, 8 */ 633 /* where the trap should return need -8 to adjust for rtsd r15, 8 */
634 la r15, r0, ret_from_exc-8 634 addik r15, r0, ret_from_exc-8
635 la r5, r1, PTO /* parameter struct pt_regs * regs */ 635 addik r5, r1, PTO /* parameter struct pt_regs * regs */
636 mfs r6, rear /* parameter unsigned long address */ 636 mfs r6, rear /* parameter unsigned long address */
637 nop 637 nop
638 ori r7, r0, 0 /* parameter unsigned long error_code */ 638 ori r7, r0, 0 /* parameter unsigned long error_code */
639 la r12, r0, do_page_fault 639 addik r12, r0, do_page_fault
640 set_vms; 640 set_vms;
641 rtbd r12, 0; /* interrupts enabled */ 641 rtbd r12, 0; /* interrupts enabled */
642 nop; 642 nop;
@@ -675,7 +675,7 @@ C_ENTRY(ret_from_exc):
675 * complete register state. Here we save anything not saved by 675 * complete register state. Here we save anything not saved by
676 * the normal entry sequence, so that it may be safely restored 676 * the normal entry sequence, so that it may be safely restored
677 * (in a possibly modified form) after do_signal returns. */ 677 * (in a possibly modified form) after do_signal returns. */
678 la r5, r1, PTO; /* Arg 1: struct pt_regs *regs */ 678 addik r5, r1, PTO; /* Arg 1: struct pt_regs *regs */
679 addi r7, r0, 0; /* Arg 3: int in_syscall */ 679 addi r7, r0, 0; /* Arg 3: int in_syscall */
680 bralid r15, do_signal; /* Handle any signals */ 680 bralid r15, do_signal; /* Handle any signals */
681 add r6, r0, r0; /* Arg 2: sigset_t *oldset */ 681 add r6, r0, r0; /* Arg 2: sigset_t *oldset */
@@ -763,10 +763,10 @@ C_ENTRY(_interrupt):
763 lwi CURRENT_TASK, r0, TOPHYS(PER_CPU(CURRENT_SAVE)); 763 lwi CURRENT_TASK, r0, TOPHYS(PER_CPU(CURRENT_SAVE));
764 swi r0, r1, PTO + PT_R0; 764 swi r0, r1, PTO + PT_R0;
765 tovirt(r1,r1) 765 tovirt(r1,r1)
766 la r5, r1, PTO; 766 addik r5, r1, PTO;
767 set_vms; 767 set_vms;
768 la r11, r0, do_IRQ; 768 addik r11, r0, do_IRQ;
769 la r15, r0, irq_call; 769 addik r15, r0, irq_call;
770irq_call:rtbd r11, 0; 770irq_call:rtbd r11, 0;
771 nop; 771 nop;
772 772
@@ -789,7 +789,7 @@ ret_from_irq:
789 beqid r11, no_intr_resched 789 beqid r11, no_intr_resched
790/* Handle a signal return; Pending signals should be in r18. */ 790/* Handle a signal return; Pending signals should be in r18. */
791 addi r7, r0, 0; /* Arg 3: int in_syscall */ 791 addi r7, r0, 0; /* Arg 3: int in_syscall */
792 la r5, r1, PTO; /* Arg 1: struct pt_regs *regs */ 792 addik r5, r1, PTO; /* Arg 1: struct pt_regs *regs */
793 bralid r15, do_signal; /* Handle any signals */ 793 bralid r15, do_signal; /* Handle any signals */
794 add r6, r0, r0; /* Arg 2: sigset_t *oldset */ 794 add r6, r0, r0; /* Arg 2: sigset_t *oldset */
795 795
@@ -892,8 +892,8 @@ C_ENTRY(_debug_exception):
892 addk r7, r0, r0 /* 3rd param zero */ 892 addk r7, r0, r0 /* 3rd param zero */
893 893
894 set_vms; 894 set_vms;
895 la r11, r0, send_sig; 895 addik r11, r0, send_sig;
896 la r15, r0, dbtrap_call; 896 addik r15, r0, dbtrap_call;
897dbtrap_call: rtbd r11, 0; 897dbtrap_call: rtbd r11, 0;
898 nop; 898 nop;
899 899
@@ -930,7 +930,7 @@ dbtrap_call: rtbd r11, 0;
930 the normal entry sequence, so that it may be safely restored 930 the normal entry sequence, so that it may be safely restored
931 (in a possibly modified form) after do_signal returns. */ 931 (in a possibly modified form) after do_signal returns. */
932 932
933 la r5, r1, PTO; /* Arg 1: struct pt_regs *regs */ 933 addik r5, r1, PTO; /* Arg 1: struct pt_regs *regs */
934 addi r7, r0, 0; /* Arg 3: int in_syscall */ 934 addi r7, r0, 0; /* Arg 3: int in_syscall */
935 bralid r15, do_signal; /* Handle any signals */ 935 bralid r15, do_signal; /* Handle any signals */
936 add r6, r0, r0; /* Arg 2: sigset_t *oldset */ 936 add r6, r0, r0; /* Arg 2: sigset_t *oldset */