diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-04-20 20:04:06 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-04-20 20:04:06 +0000 |
| commit | de6046225422c83d26153494a61b29ba8a6b997f (patch) | |
| tree | 2f1342b0048916f70a70565c5db17cfe4cb6f16e /sys/arch | |
| parent | 86a150cd964373cd9464370805c3063950423c69 (diff) | |
cleanup
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/hppa/stand/boot/srt0.S | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sys/arch/hppa/stand/boot/srt0.S b/sys/arch/hppa/stand/boot/srt0.S index a42298f99f4..7ca92aa9b07 100644 --- a/sys/arch/hppa/stand/boot/srt0.S +++ b/sys/arch/hppa/stand/boot/srt0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: srt0.S,v 1.4 1999/01/25 21:53:31 mickey Exp $ */ +/* $OpenBSD: srt0.S,v 1.5 1999/04/20 20:04:05 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -89,11 +89,12 @@ copyloop ; do stwm %r1,4(%r4) ; here we zero the .bss - ldil L%end, %r3 ; the end of all - ldil L%__bss_start, %r4 ; .bss is here - sub %r3,%r4,%r3 + ldil L%__bss_start, %r4 + ldo R%__bss_start(%r4), %r4 + ldil L%__bss_end, %r3 + ldo R%__bss_end(%r3), %r3 zeroloop - addib,>= -4,%r3,zeroloop ; while (--r3 >= 0); + combf,<,n %r3,%r4, zeroloop ; while (r4 < r3); stwm %r0,4(%r4) ; *r4++ = 0; ldil L%$global$,%dp @@ -129,15 +130,17 @@ loop addib,>,n -16,%r21,loop ; Decrement by cache line size (16). nop nop nop + bv 0(rp) + nop EXIT(begin) /* jump to relocated code */ start - ldil L%stack_base,%sp - ldo R%stack_base(%sp),%sp - dep %r0,31,6,%sp ; and ensure maximum alignment. + ldil L%HEAP_LIMIT, %sp + ldo R%HEAP_LIMIT(%sp), %sp b boot ; Call boot(), copy %r0, arg0 ; use default boot device + nop /* * rtt - restart the box @@ -149,12 +152,8 @@ ENTRY(_rtt) forever ; Loop until bus reset takes effect. b,n forever + bv 0(rp) ldo -48(sp),sp EXIT(_rtt) - .SPACE $PRIVATE$ - .EXPORT $global$ -$global$ - .WORD 0 - .end |