vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge from trunk

Browse source
This commit is contained in:
Robert Millan 2009-12-13 18:41:21 +00:00
commit 648fb15b29
18 changed files with 199 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/i386/relocator_asm.S
View file

@ -138,7 +138,7 @@ LOCAL(cont0):
lgdt (LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
/* Update %cs. Thanks to David Miller for pointing this mistake out. */
/* Update %cs. */
ljmp *(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
LOCAL(cont1):

10
lib/relocator.c
View file

@ -78,10 +78,10 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
/* Very unlikely condition: Relocator may risk overwrite itself.
Just move it a bit up. */
if ((grub_uint8_t *) UINT_TO_PTR (dest) - (grub_uint8_t *) relocator
< (signed) (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN)
&& (grub_uint8_t *) UINT_TO_PTR (dest) - (grub_uint8_t *) relocator
> - (signed) (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN))
if ((grub_addr_t) dest < (grub_addr_t) relocator
+ (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN)
&& (grub_addr_t) dest + (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
> (grub_addr_t) relocator)
{
void *relocator_new = ((grub_uint8_t *) relocator)
+ (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
@ -95,7 +95,7 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
relocator = relocator_new;
}
if (UINT_TO_PTR (dest) >= relocator)
if ((grub_addr_t) dest >= (grub_addr_t) relocator)
{
int overhead;
overhead = dest -