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

Merge relocators into mips

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-02 09:55:04 +01:00
commit 537ee0a5f1
12 changed files with 148 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/relocator.c
View file

@ -41,6 +41,9 @@ PREFIX (realloc) (void *relocator, grub_size_t size)
{
char *playground;
if (!relocator)
return PREFIX (alloc) (size);
playground = (char *) relocator - PRE_REGION_SIZE;
playground = grub_realloc (playground, size + MAX_OVERHEAD);
@ -70,8 +73,8 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
size = *(grub_size_t *) playground;
grub_dprintf ("relocator",
"Relocator: source: %p, destination: 0x%x, size: 0x%x\n",
relocator, dest, size);
"Relocator: source: %p, destination: 0x%x, size: 0x%lx\n",
relocator, (unsigned) dest, (unsigned long) size);
/* Very unlikely condition: Relocator may risk overwrite itself.
Just move it a bit up. */
@ -100,10 +103,11 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
RELOCATOR_ALIGN);
grub_dprintf ("relocator",
"Backward relocator: code %p, source: %p, "
"destination: 0x%x, size: 0x%x\n",
"destination: 0x%x, size: 0x%lx\n",
(char *) relocator - overhead,
(char *) relocator - overhead,
dest - overhead, size + overhead);
(unsigned) dest - overhead,
(unsigned long) size + overhead);
write_call_relocator_bw ((char *) relocator - overhead,
(char *) relocator - overhead,
@ -117,10 +121,11 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
+ RELOCATOR_SIZEOF (forward) - (dest + size);
grub_dprintf ("relocator",
"Forward relocator: code %p, source: %p, "
"destination: 0x%x, size: 0x%x\n",
"destination: 0x%x, size: 0x%lx\n",
(char *) relocator + size + overhead
- RELOCATOR_SIZEOF (forward),
relocator, dest, size + overhead);
relocator, (unsigned) dest,
(unsigned long) size + overhead);
write_call_relocator_fw ((char *) relocator + size + overhead
- RELOCATOR_SIZEOF (forward),