From effc6a6023aebb55d3d5ed00e6f50fbd78a63764 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 25 Aug 1999 06:44:32 +0000 Subject: Use the far jump for the base of the page arithmatic rather than the calling function, otherwise Bad Things Happen(tm) when bios16_call is not in the same page as bios_jmp. Reviewed by: msmith --- sys/amd64/amd64/bios.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/amd64') diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c index cc8e30b..521761f 100644 --- a/sys/amd64/amd64/bios.c +++ b/sys/amd64/amd64/bios.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bios.c,v 1.18 1999/08/20 21:08:41 msmith Exp $ + * $Id: bios.c,v 1.19 1999/08/24 16:42:08 msmith Exp $ */ /* @@ -78,7 +78,6 @@ bios32_init(void *junk) u_int8_t ck, *cv; int i; - /* * BIOS32 Service Directory */ @@ -288,6 +287,7 @@ set_bios_selectors(struct bios_segments *seg, int flags) } extern int vm86pa; +extern void bios_jmp(void); /* * this routine is really greedy with selectors, and uses 5: @@ -366,7 +366,7 @@ bios16(struct bios_args *args, char *fmt, ...) args->seg.args.limit = 0xffff; } - args->seg.code32.base = (u_int)&bios16_call & PG_FRAME; + args->seg.code32.base = (u_int)&bios_jmp & PG_FRAME; args->seg.code32.limit = 0xffff; ptd = (u_int *)rcr3(); -- cgit v1.1