Module Name: src
Committed By: christos
Date: Sun Oct 20 00:16:16 UTC 2013
Modified Files:
src/sys/arch/i386/stand/pxeboot: pxe_call.S
Log Message:
Move an instruction above .code16 so that it produces an R_386_32 instead
of an R_386_16 relocation, which is truncated to fit. XXX: untested.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/pxeboot/pxe_call.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/pxeboot/pxe_call.S
diff -u src/sys/arch/i386/stand/pxeboot/pxe_call.S:1.3 src/sys/arch/i386/stand/pxeboot/pxe_call.S:1.4
--- src/sys/arch/i386/stand/pxeboot/pxe_call.S:1.3 Sat Feb 1 09:48:19 2003
+++ src/sys/arch/i386/stand/pxeboot/pxe_call.S Sat Oct 19 20:16:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pxe_call.S,v 1.3 2003/02/01 14:48:19 dsl Exp $ */
+/* $NetBSD: pxe_call.S,v 1.4 2013/10/20 00:16:16 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -88,10 +88,10 @@ ENTRY(pxecall_pxenv)
movl 8(%ebp), %ebx
call _C_LABEL(prot_to_real) # enter real mode
+ /* prot_to_real() has already set %es to BOOTSEG */
+ lea _C_LABEL(pxe_command_buf), %edi
.code16
- /* prot_to_real() has already set %es to BOOTSEG */
- lea _C_LABEL(pxe_command_buf), %di
/* The encoding is: 0x9a offlo offhi seglo seghi */
lcall $0, $0xffff
