diff options
Diffstat (limited to 'sys/arch/i386/stand/cdboot')
| -rw-r--r-- | sys/arch/i386/stand/cdboot/srt0.S | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sys/arch/i386/stand/cdboot/srt0.S b/sys/arch/i386/stand/cdboot/srt0.S index 5a721e21c02..1c6efca6dc0 100644 --- a/sys/arch/i386/stand/cdboot/srt0.S +++ b/sys/arch/i386/stand/cdboot/srt0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: srt0.S,v 1.3 2012/10/31 14:31:30 jsing Exp $ */ +/* $OpenBSD: srt0.S,v 1.4 2022/12/08 01:25:45 guenther Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -31,12 +31,12 @@ #define BOOTSTACK 0xfffc - .globl _C_LABEL(end) - .globl _C_LABEL(edata) - .globl _C_LABEL(boot) - .globl _C_LABEL(_rtt) - .globl _C_LABEL(bios_bootdev) - .globl _ASM_LABEL(pmm_init) + .globl end + .globl edata + .globl boot + .globl _rtt + .globl bios_bootdev + .globl pmm_init .globl Gdtr .text @@ -75,8 +75,8 @@ _start: movw $(CDBOOTADDR >> 4), %ax /* Reloc from %ds = 0x7c0. */ movw $(LINKADDR >> 4), %bx /* Reloc to %es = 0x4012. */ - movl $_C_LABEL(end), %edx - subl $_C_LABEL(_start), %edx /* How big are we? */ + movl $end, %edx + subl $_start, %edx /* How big are we? */ /* * Relocate in blocks that are a maximum of 32KB in size, incrementing @@ -158,14 +158,14 @@ relocated: /* Zero .bss */ xorl %eax, %eax - movl $_C_LABEL(end), %ecx - subl $_C_LABEL(edata), %ecx - movl $_C_LABEL(edata), %edi + movl $end, %ecx + subl $edata, %ecx + movl $edata, %edi cld rep; stosb /* Set up an interrupt descriptor table for protected mode. */ - call _ASM_LABEL(pmm_init) + call pmm_init /* Set our program name ("CDBOOT", not "BOOT"). */ movl $cd_progname, %eax @@ -174,8 +174,8 @@ relocated: /* Put the boot device number into the globals that need it */ popl %eax /* Get this back from the stack */ pushl %eax /* boot() takes this as a parameter */ - movl %eax, _C_LABEL(bios_bootdev) - movl %eax, _C_LABEL(bios_cddev) + movl %eax, bios_bootdev + movl %eax, bios_cddev /* * Now call "main()". @@ -186,10 +186,10 @@ relocated: movl $0xb8004, %ebx movl $0x07410741, (%ebx) #endif - call _C_LABEL(boot) + call boot /* boot() should not return. If it does, reset computer. */ - jmp _C_LABEL(_rtt) + jmp _rtt ENTRY(debugchar) pushl %ebx |