524a1e6a40
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.
232 lines
6.3 KiB
Text
232 lines
6.3 KiB
Text
/* parser.y - The scripting parser. */
|
|
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 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/script.h>
|
|
#include <grub/mm.h>
|
|
|
|
#define YYFREE grub_free
|
|
#define YYMALLOC grub_malloc
|
|
#define YYLTYPE_IS_TRIVIAL 0
|
|
|
|
%}
|
|
|
|
%union {
|
|
struct grub_script_cmd *cmd;
|
|
struct grub_script_arglist *arglist;
|
|
struct grub_script_arg *arg;
|
|
char *string;
|
|
}
|
|
|
|
%token GRUB_PARSER_TOKEN_IF "if"
|
|
%token GRUB_PARSER_TOKEN_WHILE "while"
|
|
%token GRUB_PARSER_TOKEN_FUNCTION "function"
|
|
%token GRUB_PARSER_TOKEN_MENUENTRY "menuentry"
|
|
%token GRUB_PARSER_TOKEN_ELSE "else"
|
|
%token GRUB_PARSER_TOKEN_THEN "then"
|
|
%token GRUB_PARSER_TOKEN_FI "fi"
|
|
%token GRUB_PARSER_TOKEN_NAME
|
|
%token GRUB_PARSER_TOKEN_VAR
|
|
%type <cmd> script grubcmd command commands commandblock menuentry if
|
|
%type <arglist> arguments;
|
|
%type <arg> argument;
|
|
%type <string> "if" "while" "function" "else" "then" "fi"
|
|
%type <string> text GRUB_PARSER_TOKEN_NAME GRUB_PARSER_TOKEN_VAR
|
|
|
|
%pure-parser
|
|
%lex-param { struct grub_parser_param *state };
|
|
%parse-param { struct grub_parser_param *state };
|
|
|
|
%%
|
|
/* It should be possible to do this in a clean way... */
|
|
script: { state->err = 0} newlines commands
|
|
{
|
|
state->parsed = $3;
|
|
}
|
|
;
|
|
|
|
newlines: /* Empty */
|
|
| newlines '\n'
|
|
;
|
|
|
|
/* Some tokens are both used as token or as plain text. XXX: Add all
|
|
tokens without causing conflicts. */
|
|
text: GRUB_PARSER_TOKEN_NAME
|
|
{
|
|
$$ = $1;
|
|
}
|
|
| "if"
|
|
{
|
|
$$ = $1;
|
|
}
|
|
| "while"
|
|
{
|
|
$$ = $1;
|
|
}
|
|
;
|
|
|
|
/* An argument can consist of some static text mixed with variables,
|
|
for example: `foo${bar}baz'. */
|
|
argument: GRUB_PARSER_TOKEN_VAR
|
|
{
|
|
$$ = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_VAR, $1);
|
|
}
|
|
| text
|
|
{
|
|
$$ = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_STR, $1);
|
|
}
|
|
/* XXX: Currently disabled to simplify the parser. This should be
|
|
parsed by yet another parser for readibility. */
|
|
/* | argument GRUB_PARSER_TOKEN_VAR */
|
|
/* { */
|
|
/* $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_VAR, $2); */
|
|
/* } */
|
|
/* | argument text */
|
|
/* { */
|
|
/* $$ = grub_script_arg_add ($1, GRUB_SCRIPT_ARG_TYPE_STR, $2); */
|
|
/* } */
|
|
;
|
|
|
|
arguments: argument
|
|
{
|
|
$$ = grub_script_add_arglist (state, 0, $1);
|
|
}
|
|
| arguments argument
|
|
{
|
|
$$ = grub_script_add_arglist (state, $1, $2);
|
|
}
|
|
;
|
|
|
|
grubcmd: GRUB_PARSER_TOKEN_NAME arguments
|
|
{
|
|
$$ = grub_script_create_cmdline (state, $1, $2);
|
|
}
|
|
| GRUB_PARSER_TOKEN_NAME
|
|
{
|
|
$$ = grub_script_create_cmdline (state, $1, 0);
|
|
}
|
|
;
|
|
|
|
/* A single command. */
|
|
command: grubcmd { $$ = $1; }
|
|
| if { $$ = $1; }
|
|
| function { $$ = 0; }
|
|
| menuentry { $$ = $1; }
|
|
;
|
|
|
|
/* A block of commands. */
|
|
commands: command '\n'
|
|
{
|
|
$$ = grub_script_add_cmd (state, 0, $1);
|
|
}
|
|
| command
|
|
{
|
|
$$ = grub_script_add_cmd (state, 0, $1);
|
|
}
|
|
| command ';' commands
|
|
{
|
|
struct grub_script_cmdblock *cmd;
|
|
cmd = (struct grub_script_cmdblock *) $3;
|
|
$$ = grub_script_add_cmd (state, cmd, $1);
|
|
}
|
|
| command '\n' newlines commands
|
|
{
|
|
struct grub_script_cmdblock *cmd;
|
|
cmd = (struct grub_script_cmdblock *) $4;
|
|
$$ = grub_script_add_cmd (state, cmd, $1);
|
|
}
|
|
| error
|
|
{
|
|
yyerror (state, "Incorrect command");
|
|
state->err = 1;
|
|
yyerrok;
|
|
}
|
|
;
|
|
|
|
/* A function. Carefully save the memory that is allocated. Don't
|
|
change any stuff because it might seem like a fun thing to do!
|
|
Special care was take to make sure the mid-rule actions are
|
|
executed on the right moment. So the `commands' rule should be
|
|
recognised after executing the `grub_script_mem_record; and before
|
|
`grub_script_mem_record_stop'. */
|
|
function: "function" GRUB_PARSER_TOKEN_NAME
|
|
{
|
|
grub_script_lexer_ref (state->lexerstate);
|
|
} newlines '{'
|
|
{
|
|
/* The first part of the function was recognised.
|
|
Now start recording the memory usage to store
|
|
this function. */
|
|
state->func_mem = grub_script_mem_record (state);
|
|
} newlines commands '}'
|
|
{
|
|
struct grub_script *script;
|
|
|
|
/* All the memory usage for parsing this function
|
|
was recorded. */
|
|
state->func_mem = grub_script_mem_record_stop (state,
|
|
state->func_mem);
|
|
script = grub_script_create ($8, state->func_mem);
|
|
if (script)
|
|
grub_script_function_create ($2, script);
|
|
grub_script_lexer_deref (state->lexerstate);
|
|
}
|
|
;
|
|
|
|
/* Carefully designed, together with `menuentry' so everything happens
|
|
just in the expected order. */
|
|
commandblock: '{'
|
|
{
|
|
grub_script_lexer_ref (state->lexerstate);
|
|
grub_script_lexer_record_start (state->lexerstate);
|
|
}
|
|
newlines commands '}'
|
|
{
|
|
grub_script_lexer_deref (state->lexerstate);
|
|
$$ = $4;
|
|
}
|
|
;
|
|
|
|
/* A menu entry. Carefully save the memory that is allocated. */
|
|
menuentry: "menuentry" argument newlines commandblock
|
|
{
|
|
char *menu_entry;
|
|
menu_entry = grub_script_lexer_record_stop (state->lexerstate);
|
|
$$ = grub_script_create_cmdmenu (state, $2, menu_entry, 0);
|
|
}
|
|
;
|
|
|
|
/* The first part of the if statement. It's used to switch the lexer
|
|
to a state in which it demands more tokens. */
|
|
if_statement: "if" { grub_script_lexer_ref (state->lexerstate); }
|
|
;
|
|
|
|
/* The if statement. */
|
|
if: if_statement grubcmd ';' "then" commands "fi"
|
|
{
|
|
$$ = grub_script_create_cmdif (state, $2, $5, 0);
|
|
grub_script_lexer_deref (state->lexerstate);
|
|
}
|
|
| if_statement grubcmd ';' "then" commands "else" commands "fi"
|
|
{
|
|
$$ = grub_script_create_cmdif (state, $2, $5, $7);
|
|
grub_script_lexer_deref (state->lexerstate);
|
|
}
|
|
;
|