pc-bios/s390-ccw: Fix indentation in start.S

start.S is currently indented with a mixture of spaces and tabs, which
is quite ugly. QEMU coding style says indentation should be 4 spaces,
and this is also what we are using in the assembler files in the
tests/tcg/s390x/ folder already, so let's adjust start.S accordingly.

Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20230627074703.99608-2-thuth@redhat.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-06-27 09:47:00 +02:00
parent 442ef32ee5
commit f52420fa4f

View File

@ -10,37 +10,37 @@
* directory. * directory.
*/ */
.globl _start .globl _start
_start: _start:
larl %r15, stack + 0x8000 /* Set up stack */ larl %r15,stack + 0x8000 /* Set up stack */
/* clear bss */ /* clear bss */
larl %r2, __bss_start larl %r2,__bss_start
larl %r3, _end larl %r3,_end
slgr %r3, %r2 /* get sizeof bss */ slgr %r3,%r2 /* get sizeof bss */
ltgr %r3,%r3 /* bss empty? */ ltgr %r3,%r3 /* bss empty? */
jz done jz done
aghi %r3,-1 aghi %r3,-1
srlg %r4,%r3,8 /* how many 256 byte chunks? */ srlg %r4,%r3,8 /* how many 256 byte chunks? */
ltgr %r4,%r4 ltgr %r4,%r4
lgr %r1,%r2 lgr %r1,%r2
jz remainder jz remainder
loop: loop:
xc 0(256,%r1),0(%r1) xc 0(256,%r1),0(%r1)
la %r1,256(%r1) la %r1,256(%r1)
brctg %r4,loop brctg %r4,loop
remainder: remainder:
larl %r2,memsetxc larl %r2,memsetxc
ex %r3,0(%r2) ex %r3,0(%r2)
done: done:
/* set up a pgm exception disabled wait psw */ /* set up a pgm exception disabled wait psw */
larl %r2, disabled_wait_psw larl %r2,disabled_wait_psw
mvc 0x01d0(16), 0(%r2) mvc 0x01d0(16),0(%r2)
j main /* And call C */ j main /* And call C */
memsetxc: memsetxc:
xc 0(1,%r1),0(%r1) xc 0(1,%r1),0(%r1)
/* /*
@ -48,11 +48,11 @@ memsetxc:
* *
* stops the current guest cpu. * stops the current guest cpu.
*/ */
.globl disabled_wait .globl disabled_wait
disabled_wait: disabled_wait:
larl %r1,disabled_wait_psw larl %r1,disabled_wait_psw
lpswe 0(%r1) lpswe 0(%r1)
1: j 1b 1: j 1b
/* /*
@ -60,61 +60,61 @@ disabled_wait:
* *
* eats one sclp interrupt * eats one sclp interrupt
*/ */
.globl consume_sclp_int .globl consume_sclp_int
consume_sclp_int: consume_sclp_int:
/* enable service interrupts in cr0 */ /* enable service interrupts in cr0 */
stctg %c0,%c0,0(%r15) stctg %c0,%c0,0(%r15)
oi 6(%r15),0x2 oi 6(%r15),0x2
lctlg %c0,%c0,0(%r15) lctlg %c0,%c0,0(%r15)
/* prepare external call handler */ /* prepare external call handler */
larl %r1, external_new_code larl %r1,external_new_code
stg %r1, 0x1b8 stg %r1,0x1b8
larl %r1, external_new_mask larl %r1,external_new_mask
mvc 0x1b0(8),0(%r1) mvc 0x1b0(8),0(%r1)
/* load enabled wait PSW */ /* load enabled wait PSW */
larl %r1, enabled_wait_psw larl %r1,enabled_wait_psw
lpswe 0(%r1) lpswe 0(%r1)
/* /*
* void consume_io_int(void) * void consume_io_int(void)
* *
* eats one I/O interrupt * eats one I/O interrupt
*/ */
.globl consume_io_int .globl consume_io_int
consume_io_int: consume_io_int:
/* enable I/O interrupts in cr6 */ /* enable I/O interrupts in cr6 */
stctg %c6,%c6,0(%r15) stctg %c6,%c6,0(%r15)
oi 4(%r15), 0xff oi 4(%r15), 0xff
lctlg %c6,%c6,0(%r15) lctlg %c6,%c6,0(%r15)
/* prepare i/o call handler */ /* prepare i/o call handler */
larl %r1, io_new_code larl %r1,io_new_code
stg %r1, 0x1f8 stg %r1,0x1f8
larl %r1, io_new_mask larl %r1,io_new_mask
mvc 0x1f0(8),0(%r1) mvc 0x1f0(8),0(%r1)
/* load enabled wait PSW */ /* load enabled wait PSW */
larl %r1, enabled_wait_psw larl %r1,enabled_wait_psw
lpswe 0(%r1) lpswe 0(%r1)
external_new_code: external_new_code:
/* disable service interrupts in cr0 */ /* disable service interrupts in cr0 */
stctg %c0,%c0,0(%r15) stctg %c0,%c0,0(%r15)
ni 6(%r15),0xfd ni 6(%r15),0xfd
lctlg %c0,%c0,0(%r15) lctlg %c0,%c0,0(%r15)
br %r14 br %r14
io_new_code: io_new_code:
/* disable I/O interrupts in cr6 */ /* disable I/O interrupts in cr6 */
stctg %c6,%c6,0(%r15) stctg %c6,%c6,0(%r15)
ni 4(%r15), 0x00 ni 4(%r15),0x00
lctlg %c6,%c6,0(%r15) lctlg %c6,%c6,0(%r15)
br %r14 br %r14
.align 8 .align 8
disabled_wait_psw: disabled_wait_psw:
.quad 0x0002000180000000,0x0000000000000000 .quad 0x0002000180000000,0x0000000000000000
enabled_wait_psw: enabled_wait_psw:
.quad 0x0302000180000000,0x0000000000000000 .quad 0x0302000180000000,0x0000000000000000
external_new_mask: external_new_mask:
.quad 0x0000000180000000 .quad 0x0000000180000000
io_new_mask: io_new_mask:
.quad 0x0000000180000000 .quad 0x0000000180000000