Module Name: src
Committed By: dsl
Date: Thu Jun 2 18:53:01 UTC 2011
Modified Files:
src/sys/arch/i386/stand/lib: Makefile
Added Files:
src/sys/arch/i386/stand/lib: putstr32.S
Log Message:
Add C stubs to allow prints early in the boot code.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/stand/lib/putstr32.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.32 src/sys/arch/i386/stand/lib/Makefile:1.33
--- src/sys/arch/i386/stand/lib/Makefile:1.32 Fri May 20 22:29:56 2011
+++ src/sys/arch/i386/stand/lib/Makefile Thu Jun 2 18:53:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2011/05/20 22:29:56 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2011/06/02 18:53:00 dsl Exp $
S?= ${.CURDIR}/../../../..
@@ -46,7 +46,7 @@
SRCS+= bootinfo.c bootinfo_biosgeom.c bootinfo_memmap.c
SRCS+= startprog.S multiboot.S
SRCS+= biosgetsystime.S cpufunc.S bootmenu.c
-SRCS+= realprot.S message.S message32.S dump_eax.S pvcopy.S putstr.S
+SRCS+= realprot.S message.S message32.S dump_eax.S pvcopy.S putstr.S putstr32.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/putstr32.S
diff -u /dev/null src/sys/arch/i386/stand/lib/putstr32.S:1.1
--- /dev/null Thu Jun 2 18:53:01 2011
+++ src/sys/arch/i386/stand/lib/putstr32.S Thu Jun 2 18:53:00 2011
@@ -0,0 +1,69 @@
+/* $NetBSD: putstr32.S,v 1.1 2011/06/02 18:53:00 dsl Exp $ */
+
+/*-
+ * Copyright (c) 20011 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>
+
+/*
+ * Diagnostic print routines callable from 32bit C code during early
+ * parts of the boot process.
+ */
+
+/*
+ * void putstr(const char *)
+ *
+ * display message on serial port
+ */
+
+ .globl _C_LABEL(putstr32)
+_C_LABEL(putstr32):
+ .code32
+ push %esi
+ movl 8(%esp), %esi
+
+ call message32
+
+ pop %esi
+ ret
+
+/*
+ * void putint(int)
+ *
+ * display value on serial port as 8 hex digits followed by a space
+ */
+
+ .globl _C_LABEL(putint32)
+_C_LABEL(putint32):
+ .code32
+ movl 4(%esp), %eax
+
+ call dump_eax32
+
+ ret
