2009-06-23 Robert Millan <rmh.grub@aybabtu.com>
* kern/i386/pc/startup.S (real_to_prot): Access `gdtdesc' using segment 0x0 unconditionally, because the reference generated by GAS is an absolute address.
This commit is contained in:
parent
a42ce6e962
commit
9bbdfd4d3b
2 changed files with 9 additions and 7 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2009-06-23 Robert Millan <rmh.grub@aybabtu.com>
|
||||||
|
|
||||||
|
* kern/i386/pc/startup.S (real_to_prot): Access `gdtdesc' using
|
||||||
|
segment 0x0 unconditionally, because the reference generated by
|
||||||
|
GAS is an absolute address.
|
||||||
|
|
||||||
2009-06-22 Robert Millan <rmh.grub@aybabtu.com>
|
2009-06-22 Robert Millan <rmh.grub@aybabtu.com>
|
||||||
|
|
||||||
* include/grub/i386/kernel.h: Include `<grub/machine/machine.h>'.
|
* include/grub/i386/kernel.h: Include `<grub/machine/machine.h>'.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* GRUB -- GRand Unified Bootloader
|
* GRUB -- GRand Unified Bootloader
|
||||||
* Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007 Free Software Foundation, Inc.
|
* Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2009 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* GRUB is free software: you can redistribute it and/or modify
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -121,13 +121,9 @@ real_to_prot:
|
||||||
cli
|
cli
|
||||||
|
|
||||||
/* load the GDT register */
|
/* load the GDT register */
|
||||||
#ifdef APPLE_CC
|
xorw %ax, %ax
|
||||||
mov %cs, %ax
|
movw %ax, %ds
|
||||||
mov %ax, %ds
|
|
||||||
DATA32 ADDR32 lgdt gdtdesc
|
DATA32 ADDR32 lgdt gdtdesc
|
||||||
#else
|
|
||||||
DATA32 ADDR32 lgdt %cs:gdtdesc
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* turn on protected mode */
|
/* turn on protected mode */
|
||||||
movl %cr0, %eax
|
movl %cr0, %eax
|
||||||
|
|
Loading…
Add table
Reference in a new issue