diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1996-07-12 05:42:02 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1996-07-12 05:42:02 +0000 |
| commit | ec275eb27f66a86f4c47d288ddc37986a6bfec50 (patch) | |
| tree | bd6ddeadd9b100ad9e435f8715eca4a494e00e7b /sys/i386/boot | |
| parent | 18f63e25c1f8e0f8878f6cdeda1a2e32776f5503 (diff) | |
| download | src-ec275eb27f66a86f4c47d288ddc37986a6bfec50.tar.gz src-ec275eb27f66a86f4c47d288ddc37986a6bfec50.zip | |
Moved the definition of DEBUGMSG() from asm.h to start.S. This macro
is only appropriate to use in the special environment of start.S (real
mode plus some conventions about not saving registers), and asm.h is
supposed to be for generic macros.
Removed some unnecessary parentheses.
Notes
Notes:
svn path=/head/; revision=17113
Diffstat (limited to 'sys/i386/boot')
| -rw-r--r-- | sys/i386/boot/biosboot/asm.h | 9 | ||||
| -rw-r--r-- | sys/i386/boot/biosboot/start.S | 17 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h index 8abb23a3bec7..31ceab5a64c6 100644 --- a/sys/i386/boot/biosboot/asm.h +++ b/sys/i386/boot/biosboot/asm.h @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.7 92/02/29 15:33:41 rpd - * $Id: asm.h,v 1.4 1995/05/30 07:58:25 rgrimes Exp $ + * $Id: asm.h,v 1.5 1996/07/05 19:55:02 julian Exp $ */ #define S_ARG0 4(%esp) @@ -142,10 +142,3 @@ #define Entry(x) .globl EXT(x); .align ALIGN; LEXT(x) #define DATA(x) .globl EXT(x); .align ALIGN; LEXT(x) - -/* note, this calls the 'message' in boot1 */ -#define DEBUGMSG(msg) \ - data32 ;\ - mov $(msg), %esi ;\ - data32 ;\ - call EXT(message) diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S index 3d351c08612f..94a8c342170d 100644 --- a/sys/i386/boot/biosboot/start.S +++ b/sys/i386/boot/biosboot/start.S @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:29 rpd - * $Id: start.S,v 1.6 1995/09/16 13:51:20 bde Exp $ + * $Id: start.S,v 1.7 1996/07/05 19:55:05 julian Exp $ */ /* @@ -62,7 +62,15 @@ BSDPART= 0xA5 /* value of boot_ind, means bootable partition */ BOOTABLE= 0x80 /* value of boot_ind, means bootable partition */ NAMEBLOCKMAGIC= 0xfadefeed /* value of magicnumebr for block2 */ -/* to debug this, Use the DEBUGMSG(msg) macro defined in asm.S */ +/* + * This DEBUGMSG(msg) macro may be useful for debugging. Its use is + * restricted to this file since it only works in real mode. + */ +#define DEBUGMSG(msg) \ + data32 ; \ + mov $msg, %esi ; \ + data32 ; \ + call message .text @@ -89,7 +97,7 @@ start: * effectively, we push the bootstring. */ data32 - mov $(BOOTSTACK - 64), %esp + mov $BOOTSTACK-64, %esp /* set up %es, (where we will load boot2 to) */ mov %ax, %es @@ -264,7 +272,7 @@ scan: * which is just above the stack for 64 bytes. */ data32 - movl $(BOOTSTACK-64), %ecx /* 64 bytes at the top of the stack */ + movl $BOOTSTACK-64, %ecx /* 64 bytes at the top of the stack */ nxtbyte: addr32 movb %es:(%ebx), %al /* get the next byte in */ @@ -361,7 +369,6 @@ err_stop: /* * message: write the error message in %ds:%esi to console */ -ENTRY(message) message: /* * Use BIOS "int 10H Function 0Eh" to write character in teletype mode |