d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify page alignment.

Browse Source
This commit is contained in:
Marcel Moolenaar 2003-02-20 06:47:54 +00:00
parent d8fcb6da11
commit 344c6212b8
4 changed files with 16 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/boot/efi/libefi/bootinfo.c
View File

@ -253,7 +253,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey,
struct efi_devdesc *rootdev;
struct preloaded_file *xp;
vm_offset_t addr, bootinfo_addr;
u_int pad;
vm_offset_t ssym, esym;
struct file_metadata *md;
EFI_STATUS status;
@ -311,23 +310,17 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey,
if (addr < (xp->f_addr + xp->f_size))
addr = xp->f_addr + xp->f_size;
}
/* pad to a page boundary */
pad = (u_int)addr & PAGE_MASK;
if (pad != 0) {
pad = PAGE_SIZE - pad;
addr += pad;
}
addr = (addr + PAGE_MASK) & ~PAGE_MASK;
/* copy our environment */
bi->bi_envp = addr;
addr = bi_copyenv(addr);
/* pad to a page boundary */
pad = (u_int)addr & PAGE_MASK;
if (pad != 0) {
pad = PAGE_SIZE - pad;
addr += pad;
}
addr = (addr + PAGE_MASK) & ~PAGE_MASK;
/* copy module list and metadata */
bi->bi_modulep = addr;
addr = bi_copymodules(addr);

15
sys/boot/ia64/common/bootinfo.c
View File

@ -253,7 +253,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey,
struct efi_devdesc *rootdev;
struct preloaded_file *xp;
vm_offset_t addr, bootinfo_addr;
u_int pad;
vm_offset_t ssym, esym;
struct file_metadata *md;
EFI_STATUS status;
@ -311,23 +310,17 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey,
if (addr < (xp->f_addr + xp->f_size))
addr = xp->f_addr + xp->f_size;
}
/* pad to a page boundary */
pad = (u_int)addr & PAGE_MASK;
if (pad != 0) {
pad = PAGE_SIZE - pad;
addr += pad;
}
addr = (addr + PAGE_MASK) & ~PAGE_MASK;
/* copy our environment */
bi->bi_envp = addr;
addr = bi_copyenv(addr);
/* pad to a page boundary */
pad = (u_int)addr & PAGE_MASK;
if (pad != 0) {
pad = PAGE_SIZE - pad;
addr += pad;
}
addr = (addr + PAGE_MASK) & ~PAGE_MASK;
/* copy module list and metadata */
bi->bi_modulep = addr;
addr = bi_copymodules(addr);

15
sys/boot/ia64/libski/bootinfo.c
View File

@ -245,7 +245,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, char *args)
struct ski_devdesc *rootdev;
struct preloaded_file *xp;
vm_offset_t addr, bootinfo_addr;
u_int pad;
char *kernelname;
vm_offset_t ssym, esym;
struct file_metadata *md;
@ -294,23 +293,17 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, char *args)
if (addr < (xp->f_addr + xp->f_size))
addr = xp->f_addr + xp->f_size;
}
/* pad to a page boundary */
pad = (u_int)addr & PAGE_MASK;
if (pad != 0) {
pad = PAGE_SIZE - pad;
addr += pad;
}
addr = (addr + PAGE_MASK) & ~PAGE_MASK;
/* copy our environment */
bi->bi_envp = addr;
addr = bi_copyenv(addr);
/* pad to a page boundary */
pad = (u_int)addr & PAGE_MASK;
if (pad != 0) {
pad = PAGE_SIZE - pad;
addr += pad;
}
addr = (addr + PAGE_MASK) & ~PAGE_MASK;
/* copy module list and metadata */
bi->bi_modulep = addr;
addr = bi_copymodules(addr);

15
sys/boot/ia64/ski/bootinfo.c
View File

@ -245,7 +245,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, char *args)
struct ski_devdesc *rootdev;
struct preloaded_file *xp;
vm_offset_t addr, bootinfo_addr;
u_int pad;
char *kernelname;
vm_offset_t ssym, esym;
struct file_metadata *md;
@ -294,23 +293,17 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, char *args)
if (addr < (xp->f_addr + xp->f_size))
addr = xp->f_addr + xp->f_size;
}
/* pad to a page boundary */
pad = (u_int)addr & PAGE_MASK;
if (pad != 0) {
pad = PAGE_SIZE - pad;
addr += pad;
}
addr = (addr + PAGE_MASK) & ~PAGE_MASK;
/* copy our environment */
bi->bi_envp = addr;
addr = bi_copyenv(addr);
/* pad to a page boundary */
pad = (u_int)addr & PAGE_MASK;
if (pad != 0) {
pad = PAGE_SIZE - pad;
addr += pad;
}
addr = (addr + PAGE_MASK) & ~PAGE_MASK;
/* copy module list and metadata */
bi->bi_modulep = addr;
addr = bi_copymodules(addr);