diff options
| author | nyan <nyan@FreeBSD.org> | 2002-05-21 12:53:48 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2002-05-21 12:53:48 +0000 |
| commit | f7e0cf5f9d7c75cc3adb3fb2feaeb4ac34244c2c (patch) | |
| tree | 6338a171aacc927ac35a32b0c12a42b34759966c /sys/boot/pc98/kgzldr | |
| parent | a27ddf2e9db1b8875c8aef1a35a39495fb20b15b (diff) | |
| download | FreeBSD-src-f7e0cf5f9d7c75cc3adb3fb2feaeb4ac34244c2c.zip FreeBSD-src-f7e0cf5f9d7c75cc3adb3fb2feaeb4ac34244c2c.tar.gz | |
Fixed to conflict labels.
Submitted by: Kaho Toshikazu <kaho@elam.kais.kyoto-u.ac.jp>
Diffstat (limited to 'sys/boot/pc98/kgzldr')
| -rw-r--r-- | sys/boot/pc98/kgzldr/crt.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/pc98/kgzldr/crt.s b/sys/boot/pc98/kgzldr/crt.s index 466ec29..31ffce4 100644 --- a/sys/boot/pc98/kgzldr/crt.s +++ b/sys/boot/pc98/kgzldr/crt.s @@ -72,14 +72,14 @@ crt_putchr.1: cmpb $0xa,%al # New line? addl $0x2000,%ecx movb %ah,(%edi,%ecx,1) # Write attr addw $0x02,%dx - jmp putchr.3 -putchr.2: movw %dx,%ax + jmp crt_putchr.3 +crt_putchr.2: movw %dx,%ax movb $SCR_COL*2,%dl div %dl incb %al mul %dl movw %ax,%dx -putchr.3: cmpw $SCR_ROW*SCR_COL*2,%dx +crt_putchr.3: cmpw $SCR_ROW*SCR_COL*2,%dx .else xchgl %eax,%ecx # Save char movb $SCR_COL,%al # Columns per row |
