Module Name: src
Committed By: dsl
Date: Thu Nov 19 22:13:17 UTC 2009
Modified Files:
src/sys/arch/i386/stand/lib: Makefile
Added Files:
src/sys/arch/i386/stand/lib: message32.S
Log Message:
Add 32 bit versions of message and dump_eax that write directly to
the serial port. Useful for debugging - especially real_to_prot!
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/stand/lib/message32.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.28 src/sys/arch/i386/stand/lib/Makefile:1.29
--- src/sys/arch/i386/stand/lib/Makefile:1.28 Mon Mar 30 09:22:52 2009
+++ src/sys/arch/i386/stand/lib/Makefile Thu Nov 19 22:13:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/03/30 09:22:52 tsutsui Exp $
+# $NetBSD: Makefile,v 1.29 2009/11/19 22:13:17 dsl Exp $
S?= ${.CURDIR}/../../../..
@@ -23,7 +23,7 @@
SRCS+= bootinfo.c bootinfo_biosgeom.c bootinfo_memmap.c
SRCS+= startprog.S multiboot.S panic.c
SRCS+= biosgetsystime.S cpufunc.S bootmenu.c
-SRCS+= realprot.S message.S dump_eax.S pvcopy.S putstr.S
+SRCS+= realprot.S message.S message32.S dump_eax.S pvcopy.S putstr.S
SRCS+= rasops.c vbe.c biosvbe.S
.if (${I386_INCLUDE_DISK} == "yes")
SRCS+= biosdisk.c biosdisk_ll.c bios_disk.S
Added files:
Index: src/sys/arch/i386/stand/lib/message32.S
diff -u /dev/null src/sys/arch/i386/stand/lib/message32.S:1.1
--- /dev/null Thu Nov 19 22:13:17 2009
+++ src/sys/arch/i386/stand/lib/message32.S Thu Nov 19 22:13:17 2009
@@ -0,0 +1,87 @@
+/* $NetBSD: message32.S,v 1.1 2009/11/19 22:13:17 dsl Exp $ */
+
+/*-
+ * Copyright (c) 2003 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by David Laight.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+
+/*
+ * Output messages directly to serial port from 32bit mode.
+ * Useful for debugging when the real-prot is suspect.
+ *
+ * %ds:dump_eax_buff must be somewhere it is safe to write 12 bytes.
+ */
+
+#ifndef COM_PORT_VAL
+#define COM_PORT_VAL $0x3f8 /* Standard address COM1 (dty0) */
+#endif
+
+ .globl message32
+ .code32
+message32:
+ pusha
+message32_1:
+ lodsb
+2:
+ mov COM_PORT_VAL, %dx
+ outb %al, %dx
+ add $5, %dl
+3: inb %dx
+ test $0x40, %al
+ jz 3b
+
+ lodsb
+ test %al, %al
+ jnz 2b
+ popa
+ ret
+
+ .globl dump_eax32
+dump_eax32:
+ pusha
+ movl $dump_eax_buff, %esi
+ mov %esi, %edi
+ push $8
+ pop %ecx
+1: roll $4, %eax
+ push %eax
+ andb $0x0f, %al
+ addb $0x30, %al /* 30..3f - clear AF */
+#if 1 /* 5 bytes to generate real hex... */
+ daa /* 30..39, 40..45 */
+ addb $0xc0, %al /* f0..f9, 00..05 */
+ adcb $0x40, %al /* 30..39, 41..46 */
+#endif
+ movb %al,(%edi)
+ inc %edi
+ pop %eax
+ loop 1b
+ push $0x20 /* space + 3 NULs */
+ pop (%edi)
+ jmp message32_1
