2002-12-27 08:53:07 +00:00
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB -- GRand Unified Bootloader
|
2007-07-21 23:32:33 +00:00
|
|
|
* Copyright (C) 2002,2005,2006,2007 Free Software Foundation, Inc.
|
2002-12-27 08:53:07 +00:00
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2002-12-27 08:53:07 +00:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2002-12-27 08:53:07 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2002-12-27 08:53:07 +00:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-21 23:32:33 +00:00
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2002-12-27 08:53:07 +00:00
|
|
|
*/
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#ifndef GRUB_TYPES_HEADER
|
|
|
|
|
#define GRUB_TYPES_HEADER 1
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
#include <config.h>
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/cpu/types.h>
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2006-11-09 19:39:51 +00:00
|
|
|
#define UNUSED __attribute__ ((unused))
|
2006-11-03 20:28:04 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#ifdef GRUB_UTIL
|
|
|
|
|
# define GRUB_CPU_SIZEOF_VOID_P SIZEOF_VOID_P
|
|
|
|
|
# define GRUB_CPU_SIZEOF_LONG SIZEOF_LONG
|
2002-12-27 08:53:07 +00:00
|
|
|
# ifdef WORDS_BIGENDIAN
|
2004-04-04 13:46:03 +00:00
|
|
|
# define GRUB_CPU_WORDS_BIGENDIAN 1
|
2002-12-27 08:53:07 +00:00
|
|
|
# else
|
2004-04-04 13:46:03 +00:00
|
|
|
# undef GRUB_CPU_WORDS_BIGENDIAN
|
2002-12-27 08:53:07 +00:00
|
|
|
# endif
|
2004-04-04 13:46:03 +00:00
|
|
|
#else /* ! GRUB_UTIL */
|
2006-05-29 Yoshinori K. Okuji <okuji@enbug.org>
* util/powerpc/ieee1275/grub-install.in (host_cpu): Removed.
(target_cpu): New variable.
(pkglibdir): Use target_cpu instead of host_cpu.
* util/i386/pc/grub-install.in (host_cpu): Removed.
(target_cpu): New variable.
(pkglibdir): Use target_cpu instead of host_cpu.
* util/genmoddep.c: Removed.
* kern/efi/mm.c (filter_memory_map): Use GRUB_CPU_SIZEOF_VOID_P
instead of GRUB_HOST_SIZEOF_VOID_P.
* kern/dl.c: Likewise.
* include/grub/i386/types.h (GRUB_HOST_SIZEOF_VOID_P): Renamed to
...
(GRUB_TARGET_SIZEOF_VOID_P): ... this.
(GRUB_HOST_SIZEOF_LONG): Renamed to ...
(GRUB_TARGET_SIZEOF_LONG): ... this.
(GRUB_HOST_WORDS_BIGENDIAN): Renamed to ...
(GRUB_TARGET_WORDS_BIGENDIAN): ... this.
* include/grub/powerpc/types.h (GRUB_HOST_SIZEOF_VOID_P): Renamed
to ...
(GRUB_TARGET_SIZEOF_VOID_P): ... this.
(GRUB_HOST_SIZEOF_LONG): Renamed to ...
(GRUB_TARGET_SIZEOF_LONG): ... this.
(GRUB_HOST_WORDS_BIGENDIAN): Renamed to ...
(GRUB_TARGET_WORDS_BIGENDIAN): ... this.
* include/grub/sparc64/types.h (GRUB_HOST_SIZEOF_VOID_P): Renamed
to ...
(GRUB_TARGET_SIZEOF_VOID_P): ... this.
(GRUB_HOST_SIZEOF_LONG): Renamed to ...
(GRUB_TARGET_SIZEOF_LONG): ... this.
(GRUB_HOST_WORDS_BIGENDIAN): Renamed to ...
(GRUB_TARGET_WORDS_BIGENDIAN): ... this.
* include/grub/types.h [!GRUB_UTIL] (GRUB_CPU_SIZEOF_VOID_P): Use
GRUB_TARGET_SIZEOF_VOID_P instead of GRUB_HOST_SIZEOF_VOID_P.
[!GRUB_UTIL] (GRUB_CPU_SIZEOF_LONG): Use GRUB_TARGET_SIZEOF_LONG
instead of GRUB_HOST_SIZEOF_LONG.
[!GRUB_UTIL]: Refer to GRUB_TARGET_WORDS_BIGENDIAN instead of
GRUB_HOST_WORDS_BIGENDIAN to define or undefine
GRUB_CPU_WORDS_BIGENDIAN.
Refer to SIZEOF_VOID_P instead of GRUB_HOST_SIZEOF_VOID_P to
define grub_host_addr_t, grub_host_off_t, grub_host_size_t and
grub_host_ssize_t.
* conf/i386-efi.rmk (noinst_UTILITIES): Removed.
(genmoddep_SOURCES): Likewise.
* conf/i386-pc.rmk (noinst_UTILITIES): Likewise.
(genmoddep_SOURCES): Likewise.
* conf/conf/powerpc-ieee1275.rmk (noinst_UTILITIES): Likewise.
(genmoddep_SOURCES): Likewise.
* conf/conf/conf/sparc64-ieee1275.rmk (noinst_UTILITIES):
Likewise.
(genmoddep_SOURCES): Likewise.
* genmoddep.awk: New file.
* genmk.rb (Image::rule): Use TARGET_CC, TARGET_CPPFLAGS,
TARGET_CFLAGS, TARGET_ASFLAGS and TARGET_LDFLAGS instead of CC,
CPPFLAGS, CFLAGS, ASFLAGS and LDFLAGS, respectively.
(PModule::rule): Likewise.
(Program::rule): Likewise.
(Utility::rule): Use CC, CPPFLAGS, CFLAGS and LDFLAGS instead of
BUILD_CC, BUILD_CPPFLAGS, BUILD_CFLAGS and BUILD_LDFLAGS,
respectively.
* configure.ac: Rewritten intensively to use host and target
instead of build and host, respectively.
* Makefile.in (pkglibdir): Use target_cpu instead of host_cpu.
(host_cpu): Removed.
(target_cpu): New variable.
(CPPFLAGS): Added @CPPFLAGS@ and -DGRUB_LIBDIR=\"$(pkglibdir)\".
(BUILD_CC): Removed.
(BUILD_CFLAGS): Likewise.
(BUILD_CPPFLAGS): Likewise.
(TARGET_CC): New variable.
(TARGET_CFLAGS): Likewise.
(TARGET_CPPFLAGS): Likewise.
(TARGET_LDFLAGS): Likewise.
(AWK): Likewise.
(include): Use target_cpu instead of host_cpu.
(moddep.lst:): Use genmoddep.awk instead of genmoddep.
* DISTLIST: Added genmoddep.awk. Removed util/genmoddep.c.
2006-05-28 23:01:43 +00:00
|
|
|
# define GRUB_CPU_SIZEOF_VOID_P GRUB_TARGET_SIZEOF_VOID_P
|
|
|
|
|
# define GRUB_CPU_SIZEOF_LONG GRUB_TARGET_SIZEOF_LONG
|
|
|
|
|
# ifdef GRUB_TARGET_WORDS_BIGENDIAN
|
2004-04-04 13:46:03 +00:00
|
|
|
# define GRUB_CPU_WORDS_BIGENDIAN 1
|
2002-12-27 08:53:07 +00:00
|
|
|
# else
|
2004-04-04 13:46:03 +00:00
|
|
|
# undef GRUB_CPU_WORDS_BIGENDIAN
|
2002-12-27 08:53:07 +00:00
|
|
|
# endif
|
2004-04-04 13:46:03 +00:00
|
|
|
#endif /* ! GRUB_UTIL */
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#if GRUB_CPU_SIZEOF_VOID_P != GRUB_CPU_SIZEOF_LONG
|
2002-12-27 08:53:07 +00:00
|
|
|
# error "This architecture is not supported because sizeof(void *) != sizeof(long)"
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#if GRUB_CPU_SIZEOF_VOID_P != 4 && GRUB_CPU_SIZEOF_VOID_P != 8
|
2002-12-27 08:53:07 +00:00
|
|
|
# error "This architecture is not supported because sizeof(void *) != 4 and sizeof(void *) != 8"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Define various wide integers. */
|
2004-04-04 13:46:03 +00:00
|
|
|
typedef signed char grub_int8_t;
|
|
|
|
|
typedef short grub_int16_t;
|
|
|
|
|
typedef int grub_int32_t;
|
|
|
|
|
#if GRUB_CPU_SIZEOF_VOID_P == 8
|
|
|
|
|
typedef long grub_int64_t;
|
2002-12-27 08:53:07 +00:00
|
|
|
#else
|
2004-04-04 13:46:03 +00:00
|
|
|
typedef long long grub_int64_t;
|
2002-12-27 08:53:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
typedef unsigned char grub_uint8_t;
|
|
|
|
|
typedef unsigned short grub_uint16_t;
|
|
|
|
|
typedef unsigned grub_uint32_t;
|
|
|
|
|
#if GRUB_CPU_SIZEOF_VOID_P == 8
|
|
|
|
|
typedef unsigned long grub_uint64_t;
|
2002-12-27 08:53:07 +00:00
|
|
|
#else
|
2004-04-04 13:46:03 +00:00
|
|
|
typedef unsigned long long grub_uint64_t;
|
2002-12-27 08:53:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Misc types. */
|
2006-06-08 12:38:44 +00:00
|
|
|
#if GRUB_TARGET_SIZEOF_VOID_P == 8
|
|
|
|
|
typedef grub_uint64_t grub_target_addr_t;
|
|
|
|
|
typedef grub_uint64_t grub_target_off_t;
|
|
|
|
|
typedef grub_uint64_t grub_target_size_t;
|
|
|
|
|
typedef grub_int64_t grub_target_ssize_t;
|
2005-10-01 Marco Gerards <mgerards@xs4all.nl>
* configure.ac: Accept `x86_64' as host_cpu. In that case add
`-m32' to CFLAGS.
* genmk.rb (class PModule): Always use `$(#{prefix}_LDFLAGS)' when
linking.
* conf/i386-pc.rmk (COMMON_CFLAGS): Add `-m32'.
(COMMON_LDFLAGS): New variable.
(kernel_img_LDFLAGS): Include `COMMON_FLAGS'.
(_chain_mod_LDFLAGS, fshelp_mod_LDFLAGS, fat_mod_LDFLAGS)
(ext2_mod_LDFLAGS, ufs_mod_LDFLAGS, minix_mod_LDFLAGS)
(hfs_mod_LDFLAGS, jfs_mod_LDFLAGS, iso9660_mod_LDFLAGS)
(xfs_mod_LDFLAGS, _linux_mod_LDFLAGS, linux_mod_LDFLAGS)
(normal_mod_LDFLAGS, hello_mod_LDFLAGS, boot_mod_LDFLAGS)
(terminal_mod_LDFLAGS, ls_mod_LDFLAGS, cmp_mod_LDFLAGS)
(cat_mod_LDFLAGS, help_mod_LDFLAGS, reboot_mod_LDFLAGS)
(halt_mod_LDFLAGS, vga_mod_LDFLAGS, font_mod_LDFLAGS)
(terminfo_mod_LDFLAGS, serial_mod_LDFLAGS, _multiboot_mod_LDFLAGS)
(multiboot_mod_LDFLAGS, amiga_mod_LDFLAGS, apple_mod_LDFLAGS)
(pc_mod_LDFLAGS, sun_mod_LDFLAGS, loopback_mod_LDFLAGS)
(default_mod_LDFLAGS, timeout_mod_LDFLAGS, configfile_mod_LDFLAGS)
(vbe_mod_LDFLAGS, vesafb_mod_LDFLAGS, vbeinfo_mod_LDFLAGS)
(vbetest_mod_LDFLAGS, search_mod_LDFLAGS, gzio_mod_LDFLAGS): New
variables.
(normal_mod_ASFLAGS): Add `-m32'.
* include/grub/types.h (grub_host_addr_t, grub_host_off_t)
(grub_host_size_t, grub_host_ssize_t): New types.
(grub_addr_t, grub_off_t, grub_size_t, grub_ssize_t): Make type
dependant of `GRUB_CPU_SIZEOF_VOID_P' instead on
`GRUB_HOST_SIZEOF_VOID_P'.
* include/grub/kernel.h (struct grub_module_header): Type of
member offset changed to `grub_host_off_t'. Type of member size
changed to `grub_host_size_t'.
(struct grub_module_info): Type of member offset changed to
`grub_host_off_t'. Type of member size changed to
`grub_host_size_t'.
2005-10-01 19:49:55 +00:00
|
|
|
#else
|
2006-06-08 12:38:44 +00:00
|
|
|
typedef grub_uint32_t grub_target_addr_t;
|
|
|
|
|
typedef grub_uint32_t grub_target_off_t;
|
|
|
|
|
typedef grub_uint32_t grub_target_size_t;
|
|
|
|
|
typedef grub_int32_t grub_target_ssize_t;
|
2005-10-01 Marco Gerards <mgerards@xs4all.nl>
* configure.ac: Accept `x86_64' as host_cpu. In that case add
`-m32' to CFLAGS.
* genmk.rb (class PModule): Always use `$(#{prefix}_LDFLAGS)' when
linking.
* conf/i386-pc.rmk (COMMON_CFLAGS): Add `-m32'.
(COMMON_LDFLAGS): New variable.
(kernel_img_LDFLAGS): Include `COMMON_FLAGS'.
(_chain_mod_LDFLAGS, fshelp_mod_LDFLAGS, fat_mod_LDFLAGS)
(ext2_mod_LDFLAGS, ufs_mod_LDFLAGS, minix_mod_LDFLAGS)
(hfs_mod_LDFLAGS, jfs_mod_LDFLAGS, iso9660_mod_LDFLAGS)
(xfs_mod_LDFLAGS, _linux_mod_LDFLAGS, linux_mod_LDFLAGS)
(normal_mod_LDFLAGS, hello_mod_LDFLAGS, boot_mod_LDFLAGS)
(terminal_mod_LDFLAGS, ls_mod_LDFLAGS, cmp_mod_LDFLAGS)
(cat_mod_LDFLAGS, help_mod_LDFLAGS, reboot_mod_LDFLAGS)
(halt_mod_LDFLAGS, vga_mod_LDFLAGS, font_mod_LDFLAGS)
(terminfo_mod_LDFLAGS, serial_mod_LDFLAGS, _multiboot_mod_LDFLAGS)
(multiboot_mod_LDFLAGS, amiga_mod_LDFLAGS, apple_mod_LDFLAGS)
(pc_mod_LDFLAGS, sun_mod_LDFLAGS, loopback_mod_LDFLAGS)
(default_mod_LDFLAGS, timeout_mod_LDFLAGS, configfile_mod_LDFLAGS)
(vbe_mod_LDFLAGS, vesafb_mod_LDFLAGS, vbeinfo_mod_LDFLAGS)
(vbetest_mod_LDFLAGS, search_mod_LDFLAGS, gzio_mod_LDFLAGS): New
variables.
(normal_mod_ASFLAGS): Add `-m32'.
* include/grub/types.h (grub_host_addr_t, grub_host_off_t)
(grub_host_size_t, grub_host_ssize_t): New types.
(grub_addr_t, grub_off_t, grub_size_t, grub_ssize_t): Make type
dependant of `GRUB_CPU_SIZEOF_VOID_P' instead on
`GRUB_HOST_SIZEOF_VOID_P'.
* include/grub/kernel.h (struct grub_module_header): Type of
member offset changed to `grub_host_off_t'. Type of member size
changed to `grub_host_size_t'.
(struct grub_module_info): Type of member offset changed to
`grub_host_off_t'. Type of member size changed to
`grub_host_size_t'.
2005-10-01 19:49:55 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if GRUB_CPU_SIZEOF_VOID_P == 8
|
2004-04-04 13:46:03 +00:00
|
|
|
typedef grub_uint64_t grub_addr_t;
|
|
|
|
|
typedef grub_uint64_t grub_size_t;
|
|
|
|
|
typedef grub_int64_t grub_ssize_t;
|
2002-12-27 08:53:07 +00:00
|
|
|
#else
|
2004-04-04 13:46:03 +00:00
|
|
|
typedef grub_uint32_t grub_addr_t;
|
|
|
|
|
typedef grub_uint32_t grub_size_t;
|
|
|
|
|
typedef grub_int32_t grub_ssize_t;
|
2002-12-27 08:53:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
2007-10-27 11:56:58 +00:00
|
|
|
#if GRUB_CPU_SIZEOF_VOID_P == 8
|
|
|
|
|
# define ULONG_MAX 18446744073709551615UL
|
2008-09-05 15:48:37 +00:00
|
|
|
# define LONG_MAX 9223372036854775807UL
|
2007-10-27 11:56:58 +00:00
|
|
|
#else
|
|
|
|
|
# define ULONG_MAX 4294967295UL
|
2008-09-05 15:48:37 +00:00
|
|
|
# define LONG_MAX 2147483647UL
|
2007-10-27 11:56:58 +00:00
|
|
|
#endif
|
|
|
|
|
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
/* The type for representing a file offset. */
|
|
|
|
|
typedef grub_uint64_t grub_off_t;
|
|
|
|
|
|
|
|
|
|
/* The type for representing a disk block address. */
|
|
|
|
|
typedef grub_uint64_t grub_disk_addr_t;
|
2005-11-13 19:45:12 +00:00
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
/* Byte-orders. */
|
2004-04-04 13:46:03 +00:00
|
|
|
#define grub_swap_bytes16(x) \
|
2002-12-27 08:53:07 +00:00
|
|
|
({ \
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint16_t _x = (x); \
|
|
|
|
|
(grub_uint16_t) ((_x << 8) | (_x >> 8)); \
|
2002-12-27 08:53:07 +00:00
|
|
|
})
|
|
|
|
|
|
2008-07-24 23:36:13 +00:00
|
|
|
#if defined(__GNUC__) && (__GNUC__ > 3) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 3)
|
|
|
|
|
static inline grub_uint32_t grub_swap_bytes32(grub_uint32_t x)
|
|
|
|
|
{
|
|
|
|
|
return __builtin_bswap32(x);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline grub_uint64_t grub_swap_bytes64(grub_uint64_t x)
|
|
|
|
|
{
|
|
|
|
|
return __builtin_bswap64(x);
|
|
|
|
|
}
|
|
|
|
|
#else /* not gcc 4.3 or newer */
|
2004-04-04 13:46:03 +00:00
|
|
|
#define grub_swap_bytes32(x) \
|
2002-12-27 08:53:07 +00:00
|
|
|
({ \
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t _x = (x); \
|
|
|
|
|
(grub_uint32_t) ((_x << 24) \
|
|
|
|
|
| ((_x & (grub_uint32_t) 0xFF00UL) << 8) \
|
|
|
|
|
| ((_x & (grub_uint32_t) 0xFF0000UL) >> 8) \
|
2002-12-27 08:53:07 +00:00
|
|
|
| (_x >> 24)); \
|
|
|
|
|
})
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#define grub_swap_bytes64(x) \
|
2002-12-27 08:53:07 +00:00
|
|
|
({ \
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint64_t _x = (x); \
|
|
|
|
|
(grub_uint64_t) ((_x << 56) \
|
|
|
|
|
| ((_x & (grub_uint64_t) 0xFF00ULL) << 40) \
|
|
|
|
|
| ((_x & (grub_uint64_t) 0xFF0000ULL) << 24) \
|
|
|
|
|
| ((_x & (grub_uint64_t) 0xFF000000ULL) << 8) \
|
|
|
|
|
| ((_x & (grub_uint64_t) 0xFF00000000ULL) >> 8) \
|
|
|
|
|
| ((_x & (grub_uint64_t) 0xFF0000000000ULL) >> 24) \
|
|
|
|
|
| ((_x & (grub_uint64_t) 0xFF000000000000ULL) >> 40) \
|
2002-12-27 08:53:07 +00:00
|
|
|
| (_x >> 56)); \
|
|
|
|
|
})
|
2008-07-24 23:36:13 +00:00
|
|
|
#endif /* not gcc 4.3 or newer */
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#ifdef GRUB_CPU_WORDS_BIGENDIAN
|
|
|
|
|
# define grub_cpu_to_le16(x) grub_swap_bytes16(x)
|
|
|
|
|
# define grub_cpu_to_le32(x) grub_swap_bytes32(x)
|
|
|
|
|
# define grub_cpu_to_le64(x) grub_swap_bytes64(x)
|
|
|
|
|
# define grub_le_to_cpu16(x) grub_swap_bytes16(x)
|
|
|
|
|
# define grub_le_to_cpu32(x) grub_swap_bytes32(x)
|
|
|
|
|
# define grub_le_to_cpu64(x) grub_swap_bytes64(x)
|
|
|
|
|
# define grub_cpu_to_be16(x) ((grub_uint16_t) (x))
|
|
|
|
|
# define grub_cpu_to_be32(x) ((grub_uint32_t) (x))
|
|
|
|
|
# define grub_cpu_to_be64(x) ((grub_uint64_t) (x))
|
|
|
|
|
# define grub_be_to_cpu16(x) ((grub_uint16_t) (x))
|
|
|
|
|
# define grub_be_to_cpu32(x) ((grub_uint32_t) (x))
|
|
|
|
|
# define grub_be_to_cpu64(x) ((grub_uint64_t) (x))
|
2007-10-12 10:22:31 +00:00
|
|
|
# ifdef GRUB_TARGET_WORDS_BIGENDIAN
|
|
|
|
|
# define grub_target_to_host16(x) ((grub_uint16_t) (x))
|
|
|
|
|
# define grub_target_to_host32(x) ((grub_uint32_t) (x))
|
|
|
|
|
# define grub_target_to_host64(x) ((grub_uint64_t) (x))
|
|
|
|
|
# define grub_host_to_target16(x) ((grub_uint16_t) (x))
|
|
|
|
|
# define grub_host_to_target32(x) ((grub_uint32_t) (x))
|
|
|
|
|
# define grub_host_to_target64(x) ((grub_uint64_t) (x))
|
|
|
|
|
# else /* ! GRUB_TARGET_WORDS_BIGENDIAN */
|
|
|
|
|
# define grub_target_to_host16(x) grub_swap_bytes16(x)
|
|
|
|
|
# define grub_target_to_host32(x) grub_swap_bytes32(x)
|
|
|
|
|
# define grub_target_to_host64(x) grub_swap_bytes64(x)
|
|
|
|
|
# define grub_host_to_target16(x) grub_swap_bytes16(x)
|
|
|
|
|
# define grub_host_to_target32(x) grub_swap_bytes32(x)
|
|
|
|
|
# define grub_host_to_target64(x) grub_swap_bytes64(x)
|
|
|
|
|
# endif
|
2002-12-27 08:53:07 +00:00
|
|
|
#else /* ! WORDS_BIGENDIAN */
|
2004-04-04 13:46:03 +00:00
|
|
|
# define grub_cpu_to_le16(x) ((grub_uint16_t) (x))
|
|
|
|
|
# define grub_cpu_to_le32(x) ((grub_uint32_t) (x))
|
|
|
|
|
# define grub_cpu_to_le64(x) ((grub_uint64_t) (x))
|
|
|
|
|
# define grub_le_to_cpu16(x) ((grub_uint16_t) (x))
|
|
|
|
|
# define grub_le_to_cpu32(x) ((grub_uint32_t) (x))
|
|
|
|
|
# define grub_le_to_cpu64(x) ((grub_uint64_t) (x))
|
|
|
|
|
# define grub_cpu_to_be16(x) grub_swap_bytes16(x)
|
|
|
|
|
# define grub_cpu_to_be32(x) grub_swap_bytes32(x)
|
|
|
|
|
# define grub_cpu_to_be64(x) grub_swap_bytes64(x)
|
|
|
|
|
# define grub_be_to_cpu16(x) grub_swap_bytes16(x)
|
|
|
|
|
# define grub_be_to_cpu32(x) grub_swap_bytes32(x)
|
|
|
|
|
# define grub_be_to_cpu64(x) grub_swap_bytes64(x)
|
2007-10-12 10:22:31 +00:00
|
|
|
# ifdef GRUB_TARGET_WORDS_BIGENDIAN
|
|
|
|
|
# define grub_target_to_host16(x) grub_swap_bytes16(x)
|
|
|
|
|
# define grub_target_to_host32(x) grub_swap_bytes32(x)
|
|
|
|
|
# define grub_target_to_host64(x) grub_swap_bytes64(x)
|
|
|
|
|
# define grub_host_to_target16(x) grub_swap_bytes16(x)
|
|
|
|
|
# define grub_host_to_target32(x) grub_swap_bytes32(x)
|
|
|
|
|
# define grub_host_to_target64(x) grub_swap_bytes64(x)
|
|
|
|
|
# else /* ! GRUB_TARGET_WORDS_BIGENDIAN */
|
|
|
|
|
# define grub_target_to_host16(x) ((grub_uint16_t) (x))
|
|
|
|
|
# define grub_target_to_host32(x) ((grub_uint32_t) (x))
|
|
|
|
|
# define grub_target_to_host64(x) ((grub_uint64_t) (x))
|
|
|
|
|
# define grub_host_to_target16(x) ((grub_uint16_t) (x))
|
|
|
|
|
# define grub_host_to_target32(x) ((grub_uint32_t) (x))
|
|
|
|
|
# define grub_host_to_target64(x) ((grub_uint64_t) (x))
|
|
|
|
|
# endif
|
2002-12-27 08:53:07 +00:00
|
|
|
#endif /* ! WORDS_BIGENDIAN */
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#endif /* ! GRUB_TYPES_HEADER */
|