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.
263 lines
5.7 KiB
C
263 lines
5.7 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2003,2005,2006 Free Software Foundation, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* 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
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <grub/file.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/dl.h>
|
|
#include <grub/normal.h>
|
|
#include <grub/types.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/font.h>
|
|
|
|
struct entry
|
|
{
|
|
grub_uint32_t code;
|
|
grub_uint32_t offset;
|
|
};
|
|
|
|
struct font
|
|
{
|
|
struct font *next;
|
|
grub_file_t file;
|
|
grub_uint32_t num;
|
|
struct entry table[0];
|
|
};
|
|
|
|
static struct font *font_list;
|
|
|
|
static int
|
|
add_font (const char *filename)
|
|
{
|
|
grub_file_t file = 0;
|
|
char magic[4];
|
|
grub_uint32_t num, i;
|
|
struct font *font = 0;
|
|
|
|
file = grub_file_open (filename);
|
|
if (! file)
|
|
goto fail;
|
|
|
|
if (grub_file_read (file, magic, 4) != 4)
|
|
goto fail;
|
|
|
|
if (grub_memcmp (magic, GRUB_FONT_MAGIC, 4) != 0)
|
|
{
|
|
grub_error (GRUB_ERR_BAD_FONT, "invalid font magic");
|
|
goto fail;
|
|
}
|
|
|
|
if (grub_file_read (file, (char *) &num, 4) != 4)
|
|
goto fail;
|
|
|
|
num = grub_le_to_cpu32 (num);
|
|
font = (struct font *) grub_malloc (sizeof (struct font)
|
|
+ sizeof (struct entry) * num);
|
|
if (! font)
|
|
goto fail;
|
|
|
|
font->file = file;
|
|
font->num = num;
|
|
|
|
for (i = 0; i < num; i++)
|
|
{
|
|
grub_uint32_t code, offset;
|
|
|
|
if (grub_file_read (file, (char *) &code, 4) != 4)
|
|
goto fail;
|
|
|
|
if (grub_file_read (file, (char *) &offset, 4) != 4)
|
|
goto fail;
|
|
|
|
font->table[i].code = grub_le_to_cpu32 (code);
|
|
font->table[i].offset = grub_le_to_cpu32 (offset);
|
|
}
|
|
|
|
font->next = font_list;
|
|
font_list = font;
|
|
|
|
return 1;
|
|
|
|
fail:
|
|
if (font)
|
|
grub_free (font);
|
|
|
|
if (file)
|
|
grub_file_close (file);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
remove_font (struct font *font)
|
|
{
|
|
struct font **p, *q;
|
|
|
|
for (p = &font_list, q = *p; q; p = &(q->next), q = q->next)
|
|
if (q == font)
|
|
{
|
|
*p = q->next;
|
|
|
|
grub_file_close (font->file);
|
|
grub_free (font);
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Return the offset of the glyph corresponding to the codepoint CODE
|
|
in the font FONT. If no found, return zero. */
|
|
static grub_uint32_t
|
|
find_glyph (const struct font *font, grub_uint32_t code)
|
|
{
|
|
grub_uint32_t start = 0;
|
|
grub_uint32_t end = font->num - 1;
|
|
struct entry *table = font->table;
|
|
|
|
/* This shouldn't happen. */
|
|
if (font->num == 0)
|
|
return 0;
|
|
|
|
/* Do a binary search. */
|
|
while (start <= end)
|
|
{
|
|
grub_uint32_t i = (start + end) / 2;
|
|
|
|
if (table[i].code < code)
|
|
start = i + 1;
|
|
else if (table[i].code > code)
|
|
end = i - 1;
|
|
else
|
|
return table[i].offset;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Set the glyph to something stupid. */
|
|
static void
|
|
fill_with_default_glyph (grub_font_glyph_t glyph)
|
|
{
|
|
unsigned i;
|
|
|
|
for (i = 0; i < 16; i++)
|
|
glyph->bitmap[i] = (i & 1) ? 0x55 : 0xaa;
|
|
|
|
glyph->char_width = 1;
|
|
glyph->width = glyph->char_width * 8;
|
|
glyph->height = 16;
|
|
glyph->baseline = (16 * 3) / 4;
|
|
}
|
|
|
|
/* Get a glyph corresponding to the codepoint CODE. Always fill glyph
|
|
information with something, even if no glyph is found. */
|
|
int
|
|
grub_font_get_glyph (grub_uint32_t code,
|
|
grub_font_glyph_t glyph)
|
|
{
|
|
struct font *font;
|
|
grub_uint8_t bitmap[32];
|
|
|
|
/* FIXME: It is necessary to cache glyphs! */
|
|
|
|
restart:
|
|
for (font = font_list; font; font = font->next)
|
|
{
|
|
grub_uint32_t offset;
|
|
|
|
offset = find_glyph (font, code);
|
|
if (offset)
|
|
{
|
|
grub_uint32_t w;
|
|
int len;
|
|
|
|
/* Make sure we can find glyphs for error messages. Push active
|
|
error message to error stack and reset error message. */
|
|
grub_error_push ();
|
|
|
|
grub_file_seek (font->file, offset);
|
|
if ((len = grub_file_read (font->file, (char *) &w, sizeof (w)))
|
|
!= sizeof (w))
|
|
{
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
w = grub_le_to_cpu32 (w);
|
|
if (w != 1 && w != 2)
|
|
{
|
|
/* grub_error (GRUB_ERR_BAD_FONT, "invalid width"); */
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
if (bitmap
|
|
&& (grub_file_read (font->file, (char *) bitmap, w * 16)
|
|
!= (grub_ssize_t) w * 16))
|
|
{
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
/* Fill glyph with information. */
|
|
grub_memcpy (glyph->bitmap, bitmap, w * 16);
|
|
|
|
glyph->char_width = w;
|
|
glyph->width = glyph->char_width * 8;
|
|
glyph->height = 16;
|
|
glyph->baseline = (16 * 3) / 4;
|
|
|
|
/* Restore old error message. */
|
|
grub_error_pop ();
|
|
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
/* Uggh... No font was found. */
|
|
fill_with_default_glyph (glyph);
|
|
return 0;
|
|
}
|
|
|
|
static grub_err_t
|
|
font_command (struct grub_arg_list *state __attribute__ ((unused)),
|
|
int argc __attribute__ ((unused)),
|
|
char **args __attribute__ ((unused)))
|
|
{
|
|
if (argc == 0)
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no font specified");
|
|
|
|
while (argc--)
|
|
if (! add_font (*args++))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
GRUB_MOD_INIT(font_manager)
|
|
{
|
|
grub_register_command ("font", font_command, GRUB_COMMAND_FLAG_BOTH,
|
|
"font FILE...",
|
|
"Specify one or more font files to display.", 0);
|
|
}
|
|
|
|
GRUB_MOD_FINI(font_manager)
|
|
{
|
|
grub_unregister_command ("font");
|
|
}
|