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

indent

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-08-03 13:50:02 +02:00
parent c2a583ec38
commit fe7546f39a
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/i386/relocator.c
View file

@ -70,7 +70,8 @@ grub_relocator32_alloc (grub_size_t size)
playground = grub_malloc ((RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN) playground = grub_malloc ((RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
+ size + size
+ (RELOCATOR_SIZEOF(backward) + RELOCATOR_ALIGN)); + (RELOCATOR_SIZEOF (backward) +
RELOCATOR_ALIGN));
if (!playground) if (!playground)
return 0; return 0;
@ -102,7 +103,9 @@ grub_relocator32_boot (void *relocator, grub_uint32_t dest,
{ {
int overhead; int overhead;
overhead = ALIGN_UP (dest - RELOCATOR_SIZEOF(backward) - RELOCATOR_ALIGN, RELOCATOR_ALIGN); overhead =
ALIGN_UP (dest - RELOCATOR_SIZEOF (backward) - RELOCATOR_ALIGN,
RELOCATOR_ALIGN);
grub_relocator32_backward_dest = dest - overhead; grub_relocator32_backward_dest = dest - overhead;
grub_relocator32_backward_src = PTR_TO_UINT64 (relocator - overhead); grub_relocator32_backward_src = PTR_TO_UINT64 (relocator - overhead);
grub_relocator32_backward_size = size + overhead; grub_relocator32_backward_size = size + overhead;
@ -138,8 +141,11 @@ grub_relocator32_boot (void *relocator, grub_uint32_t dest,
grub_relocator32_forward_esp = state.esp; grub_relocator32_forward_esp = state.esp;
grub_memmove (relocator + size + overhead - RELOCATOR_SIZEOF (forward), grub_memmove (relocator + size + overhead - RELOCATOR_SIZEOF (forward),
&grub_relocator32_forward_start, RELOCATOR_SIZEOF(forward)); &grub_relocator32_forward_start,
entry = (void (*) ()) (relocator + size + overhead - RELOCATOR_SIZEOF(forward)); RELOCATOR_SIZEOF (forward));
entry =
(void (*)()) (relocator + size + overhead -
RELOCATOR_SIZEOF (forward));
} }
entry (); entry ();