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

fix the elf loading.

Browse source
This commit is contained in:
okuji 1999-09-04 01:09:14 +00:00
parent 04ed0a2bf7
commit e079197cd6
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
1999-09-03 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* stage2/boot.c (load_image): Use PHDR->P_PADDR instead of
PHDR->P_VADDR. Reported by Ramon van Handel <vhandel@chem.vu.nl>.
1999-09-03 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-03 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* docs/help2man: Upgraded to 1.013. * docs/help2man: Upgraded to 1.013.

1
THANKS
View file

@ -22,5 +22,6 @@ Miles Bader <miles@gnu.org>
OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
Pavel Roskin <pavel_roskin@geocities.com> Pavel Roskin <pavel_roskin@geocities.com>
Peter Astrand <altic@lysator.liu.se> Peter Astrand <altic@lysator.liu.se>
Ramon van Handel <vhandel@chem.vu.nl>
Takehiro Suzuki <takehiro@coral.ocn.ne.jp> Takehiro Suzuki <takehiro@coral.ocn.ne.jp>
VaX#n8 <vax@linkdead.paranoia.com> VaX#n8 <vax@linkdead.paranoia.com>

4
stage2/boot.c
View file

@ -420,9 +420,9 @@ load_image (char *kernel, char *arg)
filesiz = phdr->p_filesz; filesiz = phdr->p_filesz;
if (type == 'f') if (type == 'f')
memaddr = RAW_ADDR (phdr->p_vaddr & 0xFFFFFF); memaddr = RAW_ADDR (phdr->p_paddr & 0xFFFFFF);
else else
memaddr = RAW_ADDR (phdr->p_vaddr); memaddr = RAW_ADDR (phdr->p_paddr);
memsiz = phdr->p_memsz; memsiz = phdr->p_memsz;
if (memaddr < RAW_ADDR (0x100000)) if (memaddr < RAW_ADDR (0x100000))