mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-30 10:49:28 +00:00
[S390] Whitespace cleanup.
Huge s390 assembly files whitespace cleanup. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
Martin Schwidefsky
parent
52149ba6b0
commit
25d83cbfaa
9 changed files with 1357 additions and 1363 deletions
|
|
@ -426,7 +426,6 @@ sys_sigaltstack_glue:
|
||||||
l %r1,BASED(.Lsigaltstack)
|
l %r1,BASED(.Lsigaltstack)
|
||||||
br %r1 # branch to sys_sigreturn
|
br %r1 # branch to sys_sigreturn
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Program check handler routine
|
* Program check handler routine
|
||||||
*/
|
*/
|
||||||
|
|
@ -1037,7 +1036,7 @@ cleanup_io_leave_insn:
|
||||||
.Lclone: .long sys_clone
|
.Lclone: .long sys_clone
|
||||||
.Lexecve: .long sys_execve
|
.Lexecve: .long sys_execve
|
||||||
.Lfork: .long sys_fork
|
.Lfork: .long sys_fork
|
||||||
.Lrt_sigreturn:.long sys_rt_sigreturn
|
.Lrt_sigreturn: .long sys_rt_sigreturn
|
||||||
.Lrt_sigsuspend:
|
.Lrt_sigsuspend:
|
||||||
.long sys_rt_sigsuspend
|
.long sys_rt_sigsuspend
|
||||||
.Lsigreturn: .long sys_sigreturn
|
.Lsigreturn: .long sys_sigreturn
|
||||||
|
|
@ -1048,7 +1047,7 @@ cleanup_io_leave_insn:
|
||||||
.Lschedtail: .long schedule_tail
|
.Lschedtail: .long schedule_tail
|
||||||
.Lsysc_table: .long sys_call_table
|
.Lsysc_table: .long sys_call_table
|
||||||
#ifdef CONFIG_TRACE_IRQFLAGS
|
#ifdef CONFIG_TRACE_IRQFLAGS
|
||||||
.Ltrace_irq_on:.long trace_hardirqs_on
|
.Ltrace_irq_on: .long trace_hardirqs_on
|
||||||
.Ltrace_irq_off:
|
.Ltrace_irq_off:
|
||||||
.long trace_hardirqs_off
|
.long trace_hardirqs_off
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -326,7 +326,6 @@ sysc_singlestep:
|
||||||
larl %r14,sysc_return # load adr. of system return
|
larl %r14,sysc_return # load adr. of system return
|
||||||
jg do_single_step # branch to do_sigtrap
|
jg do_single_step # branch to do_sigtrap
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# call syscall_trace before and after system call
|
# call syscall_trace before and after system call
|
||||||
# special linkage: %r12 contains the return address for trace_svc
|
# special linkage: %r12 contains the return address for trace_svc
|
||||||
|
|
|
||||||
|
|
@ -326,7 +326,7 @@ iplstart:
|
||||||
l %r2,.Linitrd # addr of ramdisk
|
l %r2,.Linitrd # addr of ramdisk
|
||||||
st %r2,INITRD_START+ARCH_OFFSET-PARMAREA(%r12)
|
st %r2,INITRD_START+ARCH_OFFSET-PARMAREA(%r12)
|
||||||
bas %r14,.Lloader # load ramdisk
|
bas %r14,.Lloader # load ramdisk
|
||||||
st %r2,INITRD_SIZE+ARCH_OFFSET-PARMAREA(%r12) # store size of ramdisk
|
st %r2,INITRD_SIZE+ARCH_OFFSET-PARMAREA(%r12) # store size of rd
|
||||||
ltr %r2,%r2
|
ltr %r2,%r2
|
||||||
bnz .Lrdcont
|
bnz .Lrdcont
|
||||||
st %r2,INITRD_START+ARCH_OFFSET-PARMAREA(%r12) # no ramdisk found
|
st %r2,INITRD_START+ARCH_OFFSET-PARMAREA(%r12) # no ramdisk found
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ startup_continue:
|
||||||
sigp %r1,%r0,0x12 # switch to esame mode
|
sigp %r1,%r0,0x12 # switch to esame mode
|
||||||
sam64 # switch to 64 bit mode
|
sam64 # switch to 64 bit mode
|
||||||
lctlg %c0,%c15,.Lctl-.LPG1(%r13) # load control registers
|
lctlg %c0,%c15,.Lctl-.LPG1(%r13) # load control registers
|
||||||
lg %r12,.Lparmaddr-.LPG1(%r13)# pointer to parameter area
|
lg %r12,.Lparmaddr-.LPG1(%r13) # pointer to parameter area
|
||||||
# move IPL device to lowcore
|
# move IPL device to lowcore
|
||||||
mvc __LC_IPLDEV(4),IPL_DEVICE+4-PARMAREA(%r12)
|
mvc __LC_IPLDEV(4),IPL_DEVICE+4-PARMAREA(%r12)
|
||||||
#
|
#
|
||||||
|
|
@ -342,7 +342,7 @@ _stext: basr %r13,0 # get base
|
||||||
oi 4(%r15),0x10 # switch on low address proctection
|
oi 4(%r15),0x10 # switch on low address proctection
|
||||||
lctlg %c0,%c15,0(%r15)
|
lctlg %c0,%c15,0(%r15)
|
||||||
|
|
||||||
lam 0,15,.Laregs-.LPG3(%r13) # load access regs needed by uaccess
|
lam 0,15,.Laregs-.LPG3(%r13) # load acrs needed by uaccess
|
||||||
brasl %r14,start_kernel # go to C code
|
brasl %r14,start_kernel # go to C code
|
||||||
#
|
#
|
||||||
# We returned from start_kernel ?!? PANIK
|
# We returned from start_kernel ?!? PANIK
|
||||||
|
|
@ -352,4 +352,4 @@ _stext: basr %r13,0 # get base
|
||||||
|
|
||||||
.align 8
|
.align 8
|
||||||
.Ldw: .quad 0x0002000180000000,0x0000000000000000
|
.Ldw: .quad 0x0002000180000000,0x0000000000000000
|
||||||
.Laregs: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
.Laregs:.long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||||
|
|
|
||||||
|
|
@ -92,6 +92,3 @@ do_reipl_asm: basr %r13,0
|
||||||
.long 0x00000000,0x00000000
|
.long 0x00000000,0x00000000
|
||||||
.long 0x00000000,0x00000000
|
.long 0x00000000,0x00000000
|
||||||
.long 0x00000000,0x00000000
|
.long 0x00000000,0x00000000
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -109,4 +109,3 @@ do_reipl_asm: basr %r13,0
|
||||||
.long 0x00000000,0x00000000
|
.long 0x00000000,0x00000000
|
||||||
.long 0x00000000,0x00000000
|
.long 0x00000000,0x00000000
|
||||||
.long 0x00000000,0x00000000
|
.long 0x00000000,0x00000000
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* (C) Copyright IBM Corp. 2005
|
* (C) Copyright IBM Corp. 2005
|
||||||
*
|
*
|
||||||
* Author(s): Rolf Adelsberger <adelsberger@de.ibm.com>
|
* Author(s): Rolf Adelsberger,
|
||||||
* Heiko Carstens <heiko.carstens@de.ibm.com>
|
* Heiko Carstens <heiko.carstens@de.ibm.com>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
@ -24,10 +24,10 @@
|
||||||
.text
|
.text
|
||||||
.globl relocate_kernel
|
.globl relocate_kernel
|
||||||
relocate_kernel:
|
relocate_kernel:
|
||||||
basr %r13,0 #base address
|
basr %r13,0 # base address
|
||||||
.base:
|
.base:
|
||||||
stnsm sys_msk-.base(%r13),0xf8 #disable DAT and IRQ (external)
|
stnsm sys_msk-.base(%r13),0xf8 # disable DAT and IRQ (external)
|
||||||
spx zero64-.base(%r13) #absolute addressing mode
|
spx zero64-.base(%r13) # absolute addressing mode
|
||||||
stctl %c0,%c15,ctlregs-.base(%r13)
|
stctl %c0,%c15,ctlregs-.base(%r13)
|
||||||
stm %r0,%r15,gprregs-.base(%r13)
|
stm %r0,%r15,gprregs-.base(%r13)
|
||||||
la %r1,load_psw-.base(%r13)
|
la %r1,load_psw-.base(%r13)
|
||||||
|
|
@ -51,50 +51,50 @@
|
||||||
.back_pgm:
|
.back_pgm:
|
||||||
lm %r0,%r15,gprregs-.base(%r13)
|
lm %r0,%r15,gprregs-.base(%r13)
|
||||||
.start_reloc:
|
.start_reloc:
|
||||||
lhi %r10,-1 #preparing the mask
|
lhi %r10,-1 # preparing the mask
|
||||||
sll %r10,12 #shift it such that it becomes 0xf000
|
sll %r10,12 # shift it such that it becomes 0xf000
|
||||||
.top:
|
.top:
|
||||||
lhi %r7,4096 #load PAGE_SIZE in r7
|
lhi %r7,4096 # load PAGE_SIZE in r7
|
||||||
lhi %r9,4096 #load PAGE_SIZE in r9
|
lhi %r9,4096 # load PAGE_SIZE in r9
|
||||||
l %r5,0(%r2) #read another word for indirection page
|
l %r5,0(%r2) # read another word for indirection page
|
||||||
ahi %r2,4 #increment pointer
|
ahi %r2,4 # increment pointer
|
||||||
tml %r5,0x1 #is it a destination page?
|
tml %r5,0x1 # is it a destination page?
|
||||||
je .indir_check #NO, goto "indir_check"
|
je .indir_check # NO, goto "indir_check"
|
||||||
lr %r6,%r5 #r6 = r5
|
lr %r6,%r5 # r6 = r5
|
||||||
nr %r6,%r10 #mask it out and...
|
nr %r6,%r10 # mask it out and...
|
||||||
j .top #...next iteration
|
j .top # ...next iteration
|
||||||
.indir_check:
|
.indir_check:
|
||||||
tml %r5,0x2 #is it a indirection page?
|
tml %r5,0x2 # is it a indirection page?
|
||||||
je .done_test #NO, goto "done_test"
|
je .done_test # NO, goto "done_test"
|
||||||
nr %r5,%r10 #YES, mask out,
|
nr %r5,%r10 # YES, mask out,
|
||||||
lr %r2,%r5 #move it into the right register,
|
lr %r2,%r5 # move it into the right register,
|
||||||
j .top #and read next...
|
j .top # and read next...
|
||||||
.done_test:
|
.done_test:
|
||||||
tml %r5,0x4 #is it the done indicator?
|
tml %r5,0x4 # is it the done indicator?
|
||||||
je .source_test #NO! Well, then it should be the source indicator...
|
je .source_test # NO! Well, then it should be the source indicator...
|
||||||
j .done #ok, lets finish it here...
|
j .done # ok, lets finish it here...
|
||||||
.source_test:
|
.source_test:
|
||||||
tml %r5,0x8 #it should be a source indicator...
|
tml %r5,0x8 # it should be a source indicator...
|
||||||
je .top #NO, ignore it...
|
je .top # NO, ignore it...
|
||||||
lr %r8,%r5 #r8 = r5
|
lr %r8,%r5 # r8 = r5
|
||||||
nr %r8,%r10 #masking
|
nr %r8,%r10 # masking
|
||||||
0: mvcle %r6,%r8,0x0 #copy PAGE_SIZE bytes from r8 to r6 - pad with 0
|
0: mvcle %r6,%r8,0x0 # copy PAGE_SIZE bytes from r8 to r6 - pad with 0
|
||||||
jo 0b
|
jo 0b
|
||||||
j .top
|
j .top
|
||||||
.done:
|
.done:
|
||||||
sr %r0,%r0 #clear register r0
|
sr %r0,%r0 # clear register r0
|
||||||
la %r4,load_psw-.base(%r13) #load psw-address into the register
|
la %r4,load_psw-.base(%r13) # load psw-address into the register
|
||||||
o %r3,4(%r4) #or load address into psw
|
o %r3,4(%r4) # or load address into psw
|
||||||
st %r3,4(%r4)
|
st %r3,4(%r4)
|
||||||
mvc 0(8,%r0),0(%r4) #copy psw to absolute address 0
|
mvc 0(8,%r0),0(%r4) # copy psw to absolute address 0
|
||||||
tm have_diag308-.base(%r13),0x01
|
tm have_diag308-.base(%r13),0x01
|
||||||
jno .no_diag308
|
jno .no_diag308
|
||||||
diag %r0,%r0,0x308
|
diag %r0,%r0,0x308
|
||||||
.no_diag308:
|
.no_diag308:
|
||||||
sr %r1,%r1 #clear %r1
|
sr %r1,%r1 # clear %r1
|
||||||
sr %r2,%r2 #clear %r2
|
sr %r2,%r2 # clear %r2
|
||||||
sigp %r1,%r2,0x12 #set cpuid to zero
|
sigp %r1,%r2,0x12 # set cpuid to zero
|
||||||
lpsw 0 #hopefully start new kernel...
|
lpsw 0 # hopefully start new kernel...
|
||||||
|
|
||||||
.align 8
|
.align 8
|
||||||
zero64:
|
zero64:
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* (C) Copyright IBM Corp. 2005
|
* (C) Copyright IBM Corp. 2005
|
||||||
*
|
*
|
||||||
* Author(s): Rolf Adelsberger <adelsberger@de.ibm.com>
|
* Author(s): Rolf Adelsberger,
|
||||||
* Heiko Carstens <heiko.carstens@de.ibm.com>
|
* Heiko Carstens <heiko.carstens@de.ibm.com>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
@ -25,10 +25,10 @@
|
||||||
.text
|
.text
|
||||||
.globl relocate_kernel
|
.globl relocate_kernel
|
||||||
relocate_kernel:
|
relocate_kernel:
|
||||||
basr %r13,0 #base address
|
basr %r13,0 # base address
|
||||||
.base:
|
.base:
|
||||||
stnsm sys_msk-.base(%r13),0xf8 #disable DAT and IRQs
|
stnsm sys_msk-.base(%r13),0xf8 # disable DAT and IRQs
|
||||||
spx zero64-.base(%r13) #absolute addressing mode
|
spx zero64-.base(%r13) # absolute addressing mode
|
||||||
stctg %c0,%c15,ctlregs-.base(%r13)
|
stctg %c0,%c15,ctlregs-.base(%r13)
|
||||||
stmg %r0,%r15,gprregs-.base(%r13)
|
stmg %r0,%r15,gprregs-.base(%r13)
|
||||||
lghi %r0,3
|
lghi %r0,3
|
||||||
|
|
@ -44,9 +44,9 @@
|
||||||
lghi %r0,0
|
lghi %r0,0
|
||||||
diag %r0,%r0,0x308
|
diag %r0,%r0,0x308
|
||||||
.back:
|
.back:
|
||||||
lhi %r1,1 #mode 1 = esame
|
lhi %r1,1 # mode 1 = esame
|
||||||
sigp %r1,%r0,0x12 #switch to esame mode
|
sigp %r1,%r0,0x12 # switch to esame mode
|
||||||
sam64 #switch to 64 bit addressing mode
|
sam64 # switch to 64 bit addressing mode
|
||||||
basr %r13,0
|
basr %r13,0
|
||||||
.back_base:
|
.back_base:
|
||||||
oi have_diag308-.back_base(%r13),0x01
|
oi have_diag308-.back_base(%r13),0x01
|
||||||
|
|
@ -56,48 +56,48 @@
|
||||||
.back_pgm:
|
.back_pgm:
|
||||||
lmg %r0,%r15,gprregs-.base(%r13)
|
lmg %r0,%r15,gprregs-.base(%r13)
|
||||||
.top:
|
.top:
|
||||||
lghi %r7,4096 #load PAGE_SIZE in r7
|
lghi %r7,4096 # load PAGE_SIZE in r7
|
||||||
lghi %r9,4096 #load PAGE_SIZE in r9
|
lghi %r9,4096 # load PAGE_SIZE in r9
|
||||||
lg %r5,0(%r2) #read another word for indirection page
|
lg %r5,0(%r2) # read another word for indirection page
|
||||||
aghi %r2,8 #increment pointer
|
aghi %r2,8 # increment pointer
|
||||||
tml %r5,0x1 #is it a destination page?
|
tml %r5,0x1 # is it a destination page?
|
||||||
je .indir_check #NO, goto "indir_check"
|
je .indir_check # NO, goto "indir_check"
|
||||||
lgr %r6,%r5 #r6 = r5
|
lgr %r6,%r5 # r6 = r5
|
||||||
nill %r6,0xf000 #mask it out and...
|
nill %r6,0xf000 # mask it out and...
|
||||||
j .top #...next iteration
|
j .top # ...next iteration
|
||||||
.indir_check:
|
.indir_check:
|
||||||
tml %r5,0x2 #is it a indirection page?
|
tml %r5,0x2 # is it a indirection page?
|
||||||
je .done_test #NO, goto "done_test"
|
je .done_test # NO, goto "done_test"
|
||||||
nill %r5,0xf000 #YES, mask out,
|
nill %r5,0xf000 # YES, mask out,
|
||||||
lgr %r2,%r5 #move it into the right register,
|
lgr %r2,%r5 # move it into the right register,
|
||||||
j .top #and read next...
|
j .top # and read next...
|
||||||
.done_test:
|
.done_test:
|
||||||
tml %r5,0x4 #is it the done indicator?
|
tml %r5,0x4 # is it the done indicator?
|
||||||
je .source_test #NO! Well, then it should be the source indicator...
|
je .source_test # NO! Well, then it should be the source indicator...
|
||||||
j .done #ok, lets finish it here...
|
j .done # ok, lets finish it here...
|
||||||
.source_test:
|
.source_test:
|
||||||
tml %r5,0x8 #it should be a source indicator...
|
tml %r5,0x8 # it should be a source indicator...
|
||||||
je .top #NO, ignore it...
|
je .top # NO, ignore it...
|
||||||
lgr %r8,%r5 #r8 = r5
|
lgr %r8,%r5 # r8 = r5
|
||||||
nill %r8,0xf000 #masking
|
nill %r8,0xf000 # masking
|
||||||
0: mvcle %r6,%r8,0x0 #copy PAGE_SIZE bytes from r8 to r6 - pad with 0
|
0: mvcle %r6,%r8,0x0 # copy PAGE_SIZE bytes from r8 to r6 - pad with 0
|
||||||
jo 0b
|
jo 0b
|
||||||
j .top
|
j .top
|
||||||
.done:
|
.done:
|
||||||
sgr %r0,%r0 #clear register r0
|
sgr %r0,%r0 # clear register r0
|
||||||
la %r4,load_psw-.base(%r13) #load psw-address into the register
|
la %r4,load_psw-.base(%r13) # load psw-address into the register
|
||||||
o %r3,4(%r4) #or load address into psw
|
o %r3,4(%r4) # or load address into psw
|
||||||
st %r3,4(%r4)
|
st %r3,4(%r4)
|
||||||
mvc 0(8,%r0),0(%r4) #copy psw to absolute address 0
|
mvc 0(8,%r0),0(%r4) # copy psw to absolute address 0
|
||||||
tm have_diag308-.base(%r13),0x01
|
tm have_diag308-.base(%r13),0x01
|
||||||
jno .no_diag308
|
jno .no_diag308
|
||||||
diag %r0,%r0,0x308
|
diag %r0,%r0,0x308
|
||||||
.no_diag308:
|
.no_diag308:
|
||||||
sam31 #31 bit mode
|
sam31 # 31 bit mode
|
||||||
sr %r1,%r1 #erase register r1
|
sr %r1,%r1 # erase register r1
|
||||||
sr %r2,%r2 #erase register r2
|
sr %r2,%r2 # erase register r2
|
||||||
sigp %r1,%r2,0x12 #set cpuid to zero
|
sigp %r1,%r2,0x12 # set cpuid to zero
|
||||||
lpsw 0 #hopefully start new kernel...
|
lpsw 0 # hopefully start new kernel...
|
||||||
|
|
||||||
.align 8
|
.align 8
|
||||||
zero64:
|
zero64:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue