Skip to content

Commit

Permalink
pc-bios/s390-ccw: Use proper register names for Clang
Browse files Browse the repository at this point in the history
When compiling the s390-ccw firmware with Clang 7.0.1, I get the
following errors:

pc-bios/s390-ccw/start.S:62:19: error: invalid use of length addressing
        stctg 0,0,0(15)
                  ^
pc-bios/s390-ccw/start.S:63:12: error: invalid use of length addressing
        oi 6(15), 0x2
           ^
pc-bios/s390-ccw/start.S:64:19: error: invalid use of length addressing
        lctlg 0,0,0(15)
                  ^
pc-bios/s390-ccw/start.S:76:19: error: invalid use of length addressing
        stctg 0,0,0(15)
                  ^
pc-bios/s390-ccw/start.S:77:12: error: invalid use of length addressing
        ni 6(15), 0xfd
           ^
pc-bios/s390-ccw/start.S:78:19: error: invalid use of length addressing
        lctlg 0,0,0(15)
                  ^
pc-bios/s390-ccw/start.S:79:12: error: invalid operand for instruction
        br 14
           ^

Let's use proper register names like in the rest of this file to fix it.

Signed-off-by: Thomas Huth <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Christian Borntraeger <[email protected]>
Signed-off-by: Cornelia Huck <[email protected]>
  • Loading branch information
huth authored and cohuck committed Jan 18, 2019
1 parent 6ed675c commit 0d3a761
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pc-bios/s390-ccw/start.S
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ disabled_wait:
.globl consume_sclp_int
consume_sclp_int:
/* enable service interrupts in cr0 */
stctg 0,0,0(15)
oi 6(15), 0x2
lctlg 0,0,0(15)
stctg %c0,%c0,0(%r15)
oi 6(%r15),0x2
lctlg %c0,%c0,0(%r15)
/* prepare external call handler */
larl %r1, external_new_code
stg %r1, 0x1b8
Expand All @@ -73,10 +73,10 @@ consume_sclp_int:

external_new_code:
/* disable service interrupts in cr0 */
stctg 0,0,0(15)
ni 6(15), 0xfd
lctlg 0,0,0(15)
br 14
stctg %c0,%c0,0(%r15)
ni 6(%r15),0xfd
lctlg %c0,%c0,0(%r15)
br %r14

.align 8
disabled_wait_psw:
Expand Down

0 comments on commit 0d3a761

Please sign in to comment.