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

Replace UINT_TO_PTR and PTR_TO_UINT with explicit grub_addr_t casts.

Browse source 
* include/grub/types.h (UINT_TO_PTR): Removed. All users switched to
	grub_addr_t casts.
	(PTR_TO_UINT64): Likewise.
	(PTR_TO_UINT32): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-15 19:59:49 +01:00
parent 5ef5c51147
commit f2b60fbdb8
10 changed files with 55 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/mmap/i386/mmap.c
View file

@ -54,7 +54,7 @@ grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
{
/* FIXME: use low-memory mm allocation once it's available. */
grub_mmap_iterate (find_hook);
ret = UINT_TO_PTR (highestlow);
ret = (void *) (grub_addr_t) highestlow;
}
else
ret = grub_memalign (align, size);
@ -65,7 +65,7 @@ grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
return 0;
}
*handle = grub_mmap_register (PTR_TO_UINT64 (ret), size, type);
*handle = grub_mmap_register ((grub_addr_t) ret, size, type);
if (! *handle)
{
grub_free (ret);
@ -93,7 +93,7 @@ grub_mmap_free_and_unregister (int handle)
grub_mmap_unregister (handle);
if (addr >= 0x100000)
grub_free (UINT_TO_PTR (addr));
grub_free ((void *) (grub_addr_t) addr);
}
#endif

4
grub-core/mmap/i386/pc/mmap.c
View file

@ -101,8 +101,8 @@ preboot (int noreturn __attribute__ ((unused)))
grub_memcpy (hooktarget, &grub_machine_mmaphook_start,
&grub_machine_mmaphook_end - &grub_machine_mmaphook_start);
*((grub_uint16_t *) 0x4a) = PTR_TO_UINT32 (hooktarget) >> 4;
*((grub_uint16_t *) 0x56) = PTR_TO_UINT32 (hooktarget) >> 4;
*((grub_uint16_t *) 0x4a) = ((grub_addr_t) hooktarget) >> 4;
*((grub_uint16_t *) 0x56) = ((grub_addr_t) hooktarget) >> 4;
*((grub_uint16_t *) 0x48) = &grub_machine_mmaphook_int12
- &grub_machine_mmaphook_start;
*((grub_uint16_t *) 0x54) = &grub_machine_mmaphook_int15