merge master to newports/alpha

Conflicts:
	grub-core/term/terminfo.c

.gitignore

@@ -11,9 +11,8 @@ ahci_test
 ascii.bitmaps
 ascii.h
 autom4te.cache
-build-grub-gen-asciih
-build-grub-gen-widthspec
-build-grub-mkfont
+build_env.mk
+.bzrignore
 cdboot_test
 cmp_test
 config.cache
@@ -31,59 +30,47 @@ docs/*.info
 docs/stamp-vti
 docs/version.texi
 ehci_test
+*.elf
 example_grub_script_test
 example_scripted_test
 example_unit_test
 *.exec
-*.exec.exe
 fddboot_test
 genkernsyms.sh
 gensymlist.sh
 gentrigtables
-gentrigtables.exe
 gettext_strings_test
 grub-bin2h
-/grub-bios-setup
-/grub-bios-setup.exe
+grub-bios-setup
 grub_cmd_date
 grub_cmd_echo
 grub_cmd_regexp
 grub_cmd_set_date
 grub_cmd_sleep
-/grub-editenv
-/grub-editenv.exe
+grub-editenv
 grub-emu
-grub-emu-lite
-grub-emu.exe
-grub-emu-lite.exe
 grub_emu_init.c
 grub_emu_init.h
 grub-fstest
-grub-fstest.exe
 grub_fstest_init.c
 grub_fstest_init.h
 grub_func_test
 grub-install
-grub-install.exe
 grub-kbdcomp
 grub-macho2img
-/grub-menulst2cfg
-/grub-menulst2cfg.exe
-/grub-mk*
+grub-menulst2cfg
+grub-mk*
 grub-mount
-/grub-ofpathname
-/grub-ofpathname.exe
-grub-core/build-grub-pe2elf.exe
-/grub-probe
-/grub-probe.exe
+grub-ofpathname
+grub-pe2elf
+grub-probe
 grub_probe_init.c
 grub_probe_init.h
-/grub-reboot
+grub-reboot
 grub_script_blanklines
 grub_script_blockarg
 grub_script_break
 grub-script-check
-grub-script-check.exe
 grub_script_check_init.c
 grub_script_check_init.h
 grub_script_comments
@@ -114,18 +101,17 @@ grub_script.tab.h
 grub_script.yy.c
 grub_script.yy.h
 grub-set-default
+grub-setup
 grub_setup_init.c
 grub_setup_init.h
 grub-shell
 grub-shell-tester
 grub-sparc64-setup
-grub-sparc64-setup.exe
 gzcompress_test
 hddboot_test
 help_test
 *.img
 *.image
-*.image.exe
 include/grub/cpu
 include/grub/machine
 install-sh
@@ -141,7 +127,6 @@ mod-*.c
 missing
 netboot_test
 *.o
-*.a
 ohci_test
 partmap_test
 pata_test
@@ -170,15 +155,16 @@ GPATH
 GRTAGS
 GSYMS
 GTAGS
+Makefile.tpl
 compile
 depcomp
 mdate-sh
 texinfo.tex
 grub-core/lib/libgcrypt-grub
-.deps
-.deps-util
-.deps-core
-.dirstamp
+**/.deps
+**/.deps-util
+**/.deps-core
+**/.dirstamp
 Makefile.util.am
 contrib
 grub-core/bootinfo.txt
@@ -192,7 +178,6 @@ grub-core/gmodule.pl
 grub-core/grub.chrp
 grub-core/modinfo.sh
 grub-core/*.module
-grub-core/*.module.exe
 grub-core/*.pp
 util/bash-completion.d/grub
 grub-core/gnulib/alloca.h
@@ -214,7 +199,7 @@ grub-core/gnulib/unistd.h
 grub-core/gnulib/warn-on-use.h
 grub-core/gnulib/wchar.h
 grub-core/gnulib/wctype.h
-grub-core/rs_decoder.h
+grub-core/rs_decoder.S
 widthspec.bin
 widthspec.h
 docs/stamp-1
@@ -228,14 +213,9 @@ include/grub/gcrypt/gcrypt.h
 include/grub/gcrypt/g10lib.h
 po/POTFILES.in
 po/POTFILES-shell.in
-/grub-glue-efi
-/grub-render-label
-/grub-glue-efi.exe
-/grub-render-label.exe
+grub-glue-efi
+grub-render-label
 grub-core/gnulib/locale.h
 grub-core/gnulib/unitypes.h
 grub-core/gnulib/uniwidth.h
 build-aux/test-driver
-/garbage-gen
-/garbage-gen.exe
-/grub-fs-tester

INSTALL

@@ -15,20 +15,7 @@ configuring the GRUB.
   Note: older versions may work but support is limited
   Note: clang 3.2 or later works for i386 and x86_64 targets but results in
         much bigger binaries.
-	earlier versions not tested
-  Note: clang 3.2 or later works for arm
-	None of tested clang versions generated usable thumb code
-	earlier versions not tested
-  Note: clang 3.3 or later works for arm64
-	earlier versions have no arm64 support
-  Note: clang 3.3 or later works for mips(el)
-	earlier versions fail to generate .reginfo and hence gprel relocations
-	fail.
-  Note: clang 3.2 or later works for powerpc
-	earlier versions not tested
-  Note: clang doesn't support -mno-app-regs and so can't be used for sparc64
-  Note: clang has no support for ia64 and hence you can't compile GRUB
-	for ia64 with clang
+  Note: clang 3.4 or later works for powerpc
 * GNU Make
 * GNU Bison 2.3 or later
 * GNU gettext 0.17 or later
@@ -54,9 +41,10 @@ To build GRUB's graphical terminal (gfxterm), you need:
 If you use a development snapshot or want to hack on GRUB you may
 need the following.
 
-* Python 2.6 or later
+* Python 2.5.2 or later
 * Autoconf 2.60 or later
 * Automake 1.10.1 or later
+* Autogen 5.10 or later
 
 Prerequisites for make-check:
 

Makefile.am

@@ -68,20 +68,12 @@ starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/s
 
 build-grub-mkfont: util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
 	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
-CLEANFILES += build-grub-mkfont
-
-garbage-gen: util/garbage-gen.c
-	$(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS)  $^
-CLEANFILES += garbage-gen
-EXTRA_DIST += util/garbage-gen.c
 
 build-grub-gen-asciih: util/grub-gen-asciih.c
 	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
-CLEANFILES += build-grub-gen-asciih
 
 build-grub-gen-widthspec: util/grub-gen-widthspec.c
 	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
-CLEANFILES += build-grub-gen-widthspec
 
 if COND_STARFIELD
 starfield_DATA = dejavu_10.pf2 dejavu_12.pf2 dejavu_bold_14.pf2 dejavu_14.pf2 dejavu_16.pf2 $(starfield_theme_files)
@@ -103,7 +95,7 @@ EXTRA_DIST += $(starfield_theme_files)
 EXTRA_DIST += $(srcdir)/themes/starfield/src/slider_s.xcf $(srcdir)/themes/starfield/src/slider_n.xcf $(srcdir)/themes/starfield/src/slider_c.xcf $(srcdir)/themes/starfield/src/blob_nw.xcf $(srcdir)/themes/starfield/src/bootmenu/center.xcf $(srcdir)/themes/starfield/src/bootmenu/corner.xcf $(srcdir)/themes/starfield/src/bootmenu/side.xcf $(srcdir)/themes/starfield/src/terminalbox/side.xcf $(srcdir)/themes/starfield/src/terminalbox/corner.xcf $(srcdir)/themes/starfield/src/terminalbox/center.xcf
 
 unicode.pf2: $(FONT_SOURCE) build-grub-mkfont
-	./build-grub-mkfont -o $@ $(FONT_SOURCE) || (rm -f $@; exit 1)
+	./build-grub-mkfont -o $@ $(FONT_SOURCE)
 CLEANFILES += unicode.pf2
 
 # Arrows and lines are needed to draw the menu, so always include them
@@ -111,23 +103,23 @@ UNICODE_ARROWS=0x2190-0x2193
 UNICODE_LINES=0x2501-0x251B
 
 ascii.pf2: $(FONT_SOURCE) build-grub-mkfont
-	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES) || (rm -f $@; exit 1)
+	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += ascii.pf2
 
 euro.pf2: $(FONT_SOURCE) build-grub-mkfont
-	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES) || (rm -f $@; exit 1)
+	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += euro.pf2
 
 ascii.h: $(FONT_SOURCE) build-grub-gen-asciih
-	./build-grub-gen-asciih $(FONT_SOURCE) $@ || (rm -f $@; exit 1)
+	./build-grub-gen-asciih $(FONT_SOURCE) $@ 
 CLEANFILES += ascii.h
 
 widthspec.h: $(FONT_SOURCE) build-grub-gen-widthspec
-	./build-grub-gen-widthspec $(FONT_SOURCE) $@ || (rm -f $@; exit 1)
+	./build-grub-gen-widthspec $(FONT_SOURCE) $@ 
 CLEANFILES += widthspec.h
 
 # Install config.h into platformdir
-nodist_platform_HEADERS = config.h
+platform_HEADERS = config.h
 
 pkgdata_DATA += grub-mkconfig_lib
 
@@ -397,33 +389,4 @@ BOOTCHECK_TIMEOUT=180
 
 bootcheck: $(BOOTCHECKS)
 
-if COND_i386_coreboot
-default_payload.elf: grub-mkstandalone grub-mkimage
-	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos xfs ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
-endif
-
-windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows
-windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
-	test -d $(windowsdir) && rm -rf $(windowsdir) || true
-	test -d $(windowsdir) || mkdir $(windowsdir)
-	$(MAKE) -C po $(AM_MAKEFLAGS) windowsdir
-	$(MAKE) -C grub-core $(AM_MAKEFLAGS) windowsdir
-	test -d $(windowsdir)/themes || mkdir $(windowsdir)/themes
-	test -d $(windowsdir)/themes/starfield || mkdir $(windowsdir)/themes/starfield
-	for x in $(PROGRAMS); do \
-		if [ x$(STRIP) != x ]; then $(STRIP) $$x -o $(windowsdir)/$$x; \
-		else cp -fp $$x $(windowsdir)/$$x; fi; \
-	done
-	for x in $(pkgdata_DATA); do \
-		cp -fp $$x $(windowsdir)/$$x; \
-	done
-	for x in $(starfield_DATA); do \
-		cp -fp $$x $(windowsdir)/themes/starfield/$$(basename $$x); \
-	done
-
-windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip
-windowszip: windowsdir
-	test -f $(windowszip) && rm $(windowszip) || true
-	zip -r $(windowszip) $(windowsdir)
-
 EXTRA_DIST += linguas.sh

Makefile.util.def

@@ -62,7 +62,6 @@ library = {
   common_nodist = grub_script.tab.h;
 
   common = grub-core/commands/blocklist.c;
-  common = grub-core/commands/macbless.c;
   common = grub-core/commands/xnu_uuid.c;
   common = grub-core/commands/testload.c;
   common = grub-core/commands/ls.c;
@@ -119,7 +118,6 @@ library = {
   common = grub-core/fs/sfs.c;
   common = grub-core/fs/squash4.c;
   common = grub-core/fs/tar.c;
-  common = grub-core/fs/greffs.c;
   common = grub-core/fs/udf.c;
   common = grub-core/fs/ufs2.c;
   common = grub-core/fs/ufs.c;
@@ -156,11 +154,8 @@ library = {
   common = grub-core/script/script.c;
   common = grub-core/script/argv.c;
   common = grub-core/io/gzio.c;
-  common = grub-core/io/xzio.c;
   common = grub-core/io/lzopio.c;
   common = grub-core/kern/ia64/dl_helper.c;
-  common = grub-core/kern/arm/dl_helper.c;
-  common = grub-core/kern/arm64/dl_helper.c;
   common = grub-core/lib/minilzo/minilzo.c;
   common = grub-core/lib/xzembed/xz_dec_bcj.c;
   common = grub-core/lib/xzembed/xz_dec_lzma2.c;
@@ -176,11 +171,8 @@ program = {
   common = util/resolve.c;
   common = grub-core/kern/emu/argp_common.c;
   common = grub-core/osdep/init.c;
-  common = grub-core/osdep/config.c;
-  extra_dist = grub-core/osdep/aros/config.c;
-  extra_dist = grub-core/osdep/windows/config.c;
-  extra_dist = grub-core/osdep/unix/config.c;
-  common = util/config.c;
+
+  common = grub-core/kern/arm/dl_helper.c;
 
   extra_dist = util/grub-mkimagexx.c;
 
@@ -258,7 +250,7 @@ program = {
   name = grub-macho2img;
   mansection = 1;
   common = util/grub-macho2img.c;
-  condition = COND_APPLE_LINKER;
+  condition = COND_APPLE_CC;
 };
 
 program = {
@@ -318,7 +310,6 @@ program = {
   installdir = sbin;
   mansection = 8;
   common = util/grub-probe.c;
-  common = util/probe.c;
   common = grub-core/osdep/ofpath.c;
   common = grub-core/kern/emu/argp_common.c;
   common = grub-core/osdep/init.c;
@@ -403,21 +394,6 @@ program = {
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
 
-program = {
-  name = grub-macbless;
-  installdir = sbin;
-  mansection = 1;
-  common = util/grub-macbless.c;
-  common = grub-core/osdep/init.c;
-  common = grub-core/kern/emu/argp_common.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};
-
 data = {
   common = util/grub.d/README;
   installdir = grubconf;
@@ -440,42 +416,49 @@ script = {
   name = '10_hurd';
   common = util/grub.d/10_hurd.in;
   installdir = grubconf;
+  condition = COND_HOST_HURD;
 };
 
 script = {
   name = '10_kfreebsd';
   common = util/grub.d/10_kfreebsd.in;
   installdir = grubconf;
+  condition = COND_HOST_KFREEBSD;
 };
 
 script = {
   name = '10_illumos';
   common = util/grub.d/10_illumos.in;
   installdir = grubconf;
+  condition = COND_HOST_ILLUMOS;
 };
 
 script = {
   name = '10_netbsd';
   common = util/grub.d/10_netbsd.in;
   installdir = grubconf;
+  condition = COND_HOST_NETBSD;
 };
 
 script = {
   name = '10_linux';
   common = util/grub.d/10_linux.in;
   installdir = grubconf;
+  condition = COND_HOST_LINUX;
 };
 
 script = {
   name = '10_xnu';
   common = util/grub.d/10_xnu.in;
   installdir = grubconf;
+  condition = COND_HOST_XNU;
 };
 
 script = {
   name = '20_linux_xen';
   common = util/grub.d/20_linux_xen.in;
   installdir = grubconf;
+  condition = COND_HOST_LINUX;
 };
 
 script = {
@@ -496,161 +479,38 @@ script = {
   installdir = grubconf;
 };
 
-program = {
+script = {
   mansection = 1;
   name = grub-mkrescue;
-
-  common = util/grub-mkrescue.c;
-  common = util/render-label.c;
-  common = util/glue-efi.c;
-  common = util/mkimage.c;
-  common = util/grub-install-common.c;
-  common = util/setup_bios.c;
-  common = util/setup_sparc.c;
-  common = grub-core/lib/reed_solomon.c;
-  common = grub-core/osdep/random.c;
-  common = grub-core/osdep/ofpath.c;
-  common = grub-core/osdep/platform.c;
-  common = grub-core/osdep/platform_unix.c;
-  common = grub-core/osdep/compress.c;
-  extra_dist = grub-core/osdep/unix/compress.c;
-  extra_dist = grub-core/osdep/basic/compress.c;
-  common = util/editenv.c;
-  common = grub-core/osdep/blocklist.c;
-  common = grub-core/osdep/config.c;
-  common = util/config.c;
-
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-
-  common = util/resolve.c;
-
-  common = grub-core/kern/emu/argp_common.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = '$(LIBLZMA)';
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-
-  condition = COND_HAVE_EXEC;
+  common = util/grub-install_header;
+  common = util/grub-mkrescue.in;
+  enable = noemu;
 };
 
-program = {
+script = {
   mansection = 1;
   name = grub-mkstandalone;
-  common = util/grub-mkstandalone.c;
-
-  common = util/render-label.c;
-  common = util/glue-efi.c;
-  common = util/mkimage.c;
-  common = util/grub-install-common.c;
-  common = util/setup_bios.c;
-  common = util/setup_sparc.c;
-  common = grub-core/lib/reed_solomon.c;
-  common = grub-core/osdep/random.c;
-  common = grub-core/osdep/ofpath.c;
-  common = grub-core/osdep/platform.c;
-  common = grub-core/osdep/platform_unix.c;
-  extra_dist = grub-core/osdep/linux/platform.c;
-  extra_dist = grub-core/osdep/windows/platform.c;
-  extra_dist = grub-core/osdep/basic/platform.c;
-  extra_dist = grub-core/osdep/basic/no_platform.c;
-  extra_dist = grub-core/osdep/unix/platform.c;
-  common = grub-core/osdep/compress.c;
-  common = util/editenv.c;
-  common = grub-core/osdep/blocklist.c;
-  common = grub-core/osdep/config.c;
-  common = util/config.c;
-
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-
-  common = util/resolve.c;
-
-  common = grub-core/kern/emu/argp_common.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = '$(LIBLZMA)';
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  common = util/grub-install_header;
+  common = util/grub-mkstandalone.in;
 };
 
-program = {
+script = {
   mansection = 8;
   installdir = sbin;
   name = grub-install;
 
-  common = util/grub-install.c;
-  common = util/probe.c;
-  common = util/mkimage.c;
-  common = util/grub-install-common.c;
-  common = util/setup_bios.c;
-  common = util/setup_sparc.c;
-  common = grub-core/lib/reed_solomon.c;
-  common = grub-core/osdep/random.c;
-  common = grub-core/osdep/ofpath.c;
-  common = grub-core/osdep/platform.c;
-  common = grub-core/osdep/platform_unix.c;
-  common = grub-core/osdep/compress.c;
-  common = util/editenv.c;
-  common = grub-core/osdep/blocklist.c;
-  common = grub-core/osdep/config.c;
-  common = util/config.c;
-  common = util/render-label.c;
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-
-  common = util/resolve.c;
+  common = util/grub-install_header;
+  common = util/grub-install.in;
   enable = noemu;
-  common = grub-core/kern/emu/argp_common.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = '$(LIBLZMA)';
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
 
-program = {
+script = {
   mansection = 1;
   installdir = bin;
   name = grub-mknetdir;
 
-  common = util/grub-mknetdir.c;
-
-  common = util/mkimage.c;
-  common = util/grub-install-common.c;
-  common = util/setup_bios.c;
-  common = util/setup_sparc.c;
-  common = grub-core/lib/reed_solomon.c;
-  common = grub-core/osdep/random.c;
-  common = grub-core/osdep/ofpath.c;
-  common = grub-core/osdep/platform.c;
-  common = grub-core/osdep/platform_unix.c;
-  common = grub-core/osdep/compress.c;
-  common = util/editenv.c;
-  common = grub-core/osdep/blocklist.c;
-  common = grub-core/osdep/config.c;
-  common = util/config.c;
-
-  common = util/resolve.c;
-  common = grub-core/kern/emu/argp_common.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = '$(LIBLZMA)';
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  common = util/grub-install_header;
+  common = util/grub-mknetdir.in;
 };
 
 script = {
@@ -698,127 +558,6 @@ script = {
   installdir = noinst;
 };
 
-script = {
-  name = grub-fs-tester;
-  common = tests/util/grub-fs-tester.in;
-  installdir = noinst;
-  dependencies = garbage-gen;
-};
-
-script = {
-  testcase;
-  name = ext234_test;
-  common = tests/ext234_test.in;
-};
-
-script = {
-  testcase;
-  name = squashfs_test;
-  common = tests/squashfs_test.in;
-};
-
-script = {
-  testcase;
-  name = iso9660_test;
-  common = tests/iso9660_test.in;
-};
-
-script = {
-  testcase;
-  name = hfsplus_test;
-  common = tests/hfsplus_test.in;
-};
-
-script = {
-  testcase;
-  name = ntfs_test;
-  common = tests/ntfs_test.in;
-};
-
-script = {
-  testcase;
-  name = reiserfs_test;
-  common = tests/reiserfs_test.in;
-};
-
-script = {
-  testcase;
-  name = fat_test;
-  common = tests/fat_test.in;
-};
-
-script = {
-  testcase;
-  name = minixfs_test;
-  common = tests/minixfs_test.in;
-};
-
-script = {
-  testcase;
-  name = xfs_test;
-  common = tests/xfs_test.in;
-};
-
-script = {
-  testcase;
-  name = nilfs2_test;
-  common = tests/nilfs2_test.in;
-};
-
-script = {
-  testcase;
-  name = romfs_test;
-  common = tests/romfs_test.in;
-};
-
-script = {
-  testcase;
-  name = exfat_test;
-  common = tests/exfat_test.in;
-};
-
-script = {
-  testcase;
-  name = tar_test;
-  common = tests/tar_test.in;
-};
-
-script = {
-  testcase;
-  name = udf_test;
-  common = tests/udf_test.in;
-};
-
-script = {
-  testcase;
-  name = hfs_test;
-  common = tests/hfs_test.in;
-};
-
-script = {
-  testcase;
-  name = jfs_test;
-  common = tests/jfs_test.in;
-};
-
-script = {
-  testcase;
-  name = btrfs_test;
-  common = tests/btrfs_test.in;
-};
-
-script = {
-  testcase;
-  name = zfs_test;
-  common = tests/zfs_test.in;
-};
-
-script = {
-  testcase;
-  name = cpio_test;
-  common = tests/cpio_test.in;
-};
-
 script = {
   testcase;
   name = example_scripted_test;
@@ -1236,24 +975,6 @@ program = {
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
 
-program = {
-  name = grub-syslinux2cfg;
-  mansection = 1;
-  common = util/grub-syslinux2cfg.c;
-  common = grub-core/lib/syslinux_parse.c;
-  common = grub-core/lib/getline.c;
-  common = grub-core/osdep/init.c;
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-  common = grub-core/kern/emu/argp_common.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};
-
 program = {
   name = grub-glue-efi;
   mansection = 1;
@@ -1287,32 +1008,3 @@ program = {
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
-
-program = {
-  name = grub-file;
-  mansection = 1;
-
-  common = util/grub-file.c;
-  common = util/render-label.c;
-  common = grub-core/commands/file.c;
-  common = grub-core/commands/file32.c;
-  common = grub-core/commands/file64.c;
-  common = grub-core/loader/i386/xen_file.c;
-  common = grub-core/loader/i386/xen_file32.c;
-  common = grub-core/loader/i386/xen_file64.c;
-  common = grub-core/io/offset.c;
-  common = grub-core/kern/elf.c;
-  common = grub-core/loader/lzss.c;
-  common = grub-core/loader/macho.c;
-  common = grub-core/loader/macho32.c;
-  common = grub-core/loader/macho64.c;
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};

acinclude.m4

@@ -19,8 +19,6 @@ AC_DEFUN([grub_PROG_TARGET_CC],
 AC_CACHE_VAL(grub_cv_prog_target_cc,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
 int main (void);
 ]], [[]])],
   		[grub_cv_prog_target_cc=yes],
@@ -136,29 +134,6 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
 fi
 ])
 
-dnl Check nm
-AC_DEFUN([grub_PROG_NM_WORKS],
-[AC_MSG_CHECKING([whether nm works])
-AC_CACHE_VAL(grub_cv_prog_nm_works,
-[
-nm_works_tmp_dir="$(mktemp -d "./confXXXXXX")"
-AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
-$TARGET_CC $TARGET_CFLAGS -c conftest.c -o "$nm_works_tmp_dir/ef"
-if $TARGET_NM "$nm_works_tmp_dir/ef" > /dev/null; then
-   grub_cv_prog_nm_works=yes
-else
-   grub_cv_prog_nm_minus_p=no
-fi
-rm "$nm_works_tmp_dir/ef"
-rmdir "$nm_works_tmp_dir"
-])
-AC_MSG_RESULT([$grub_cv_prog_nm_works])
-
-if test "x$grub_cv_prog_nm_works" != xyes; then
-  AC_MSG_ERROR([nm does not work])
-fi
-])
-
 dnl Supply -P to nm
 AC_DEFUN([grub_PROG_NM_MINUS_P],
 [AC_MSG_CHECKING([whether nm accepts -P])
@@ -166,14 +141,13 @@ AC_CACHE_VAL(grub_cv_prog_nm_minus_p,
 [
 nm_minus_p_tmp_dir="$(mktemp -d "./confXXXXXX")"
 AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
-$TARGET_CC $TARGET_CFLAGS -c conftest.c -o "$nm_minus_p_tmp_dir/ef"
+$TARGET_CC conftest.c -o "$nm_minus_p_tmp_dir/ef"
 if $TARGET_NM -P "$nm_minus_p_tmp_dir/ef" 2>&1 > /dev/null; then
    grub_cv_prog_nm_minus_p=yes
 else
    grub_cv_prog_nm_minus_p=no
 fi
 rm "$nm_minus_p_tmp_dir/ef"
-rmdir "$nm_minus_p_tmp_dir"
 ])
 AC_MSG_RESULT([$grub_cv_prog_nm_minus_p])
 
@@ -191,14 +165,13 @@ AC_CACHE_VAL(grub_cv_prog_nm_defined_only,
 [
 nm_defined_only_tmp_dir="$(mktemp -d "./confXXXXXX")"
 AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
-$TARGET_CC $TARGET_CFLAGS -c conftest.c -o "$nm_defined_only_tmp_dir/ef"
+$TARGET_CC conftest.c -o "$nm_defined_only_tmp_dir/ef"
 if $TARGET_NM --defined-only "$nm_defined_only_tmp_dir/ef" 2>&1 > /dev/null; then
    grub_cv_prog_nm_defined_only=yes
 else
    grub_cv_prog_nm_defined_only=no
 fi
 rm "$nm_defined_only_tmp_dir/ef"
-rmdir "$nm_defined_only_tmp_dir"
 ])
 AC_MSG_RESULT([$grub_cv_prog_nm_defined_only])
 
@@ -210,18 +183,118 @@ fi
 ])
 
 
+dnl Mass confusion!
+dnl Older versions of GAS interpret `.code16' to mean ``generate 32-bit
+dnl instructions, but implicitly insert addr32 and data32 bytes so
+dnl that the code works in real mode''.
+dnl
+dnl Newer versions of GAS interpret `.code16' to mean ``generate 16-bit
+dnl instructions,'' which seems right.  This requires the programmer
+dnl to explicitly insert addr32 and data32 instructions when they want
+dnl them.
+dnl
+dnl We only support the newer versions, because the old versions cause
+dnl major pain, by requiring manual assembly to get 16-bit instructions into
+dnl asm files.
+AC_DEFUN([grub_I386_ASM_ADDR32],
+[AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([grub_I386_ASM_PREFIX_REQUIREMENT])
+AC_MSG_CHECKING([for .code16 addr32 assembler support])
+AC_CACHE_VAL(grub_cv_i386_asm_addr32,
+[cat > conftest.s.in <<\EOF
+	.code16
+l1:	@ADDR32@	movb	%al, l1
+EOF
+
+if test "x$grub_cv_i386_asm_prefix_requirement" = xyes; then
+  sed -e s/@ADDR32@/addr32/ < conftest.s.in > conftest.s
+else
+  sed -e s/@ADDR32@/addr32\;/ < conftest.s.in > conftest.s
+fi
+
+if AC_TRY_COMMAND([${CC-cc} ${TARGET_CCASFLAGS} ${CFLAGS} -c conftest.s]) && test -s conftest.o; then
+  grub_cv_i386_asm_addr32=yes
+else
+  grub_cv_i386_asm_addr32=no
+fi
+
+rm -f conftest*])
+
+AC_MSG_RESULT([$grub_cv_i386_asm_addr32])])
+
+dnl check if our compiler is apple cc
+dnl because it requires numerous workarounds
+AC_DEFUN([grub_apple_cc],
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING([whether our compiler is apple cc])
+AC_CACHE_VAL(grub_cv_apple_cc,
+[if $CC -v 2>&1 | grep "Apple Inc." > /dev/null; then
+  grub_cv_apple_cc=yes
+else
+  grub_cv_apple_cc=no
+fi
+])
+
+AC_MSG_RESULT([$grub_cv_apple_cc])])
+
+dnl check if our target compiler is apple cc
+dnl because it requires numerous workarounds
+AC_DEFUN([grub_apple_target_cc],
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING([whether our target compiler is apple cc])
+AC_CACHE_VAL(grub_cv_apple_target_cc,
+[if $CC -v 2>&1 | grep "Apple Inc." > /dev/null; then
+  grub_cv_apple_target_cc=yes
+else
+  grub_cv_apple_target_cc=no
+fi
+])
+
+AC_MSG_RESULT([$grub_cv_apple_target_cc])])
+
+
+dnl Later versions of GAS requires that addr32 and data32 prefixes
+dnl appear in the same lines as the instructions they modify, while
+dnl earlier versions requires that they appear in separate lines.
+AC_DEFUN([grub_I386_ASM_PREFIX_REQUIREMENT],
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING(dnl
+[whether addr32 must be in the same line as the instruction])
+AC_CACHE_VAL(grub_cv_i386_asm_prefix_requirement,
+[cat > conftest.s <<\EOF
+	.code16
+l1:	addr32	movb	%al, l1
+EOF
+
+if AC_TRY_COMMAND([${CC-cc} ${TARGET_CCASFLAGS} ${CFLAGS} -c conftest.s]) && test -s conftest.o; then
+  grub_cv_i386_asm_prefix_requirement=yes
+else
+  grub_cv_i386_asm_prefix_requirement=no
+fi
+
+rm -f conftest*])
+
+if test "x$grub_cv_i386_asm_prefix_requirement" = xyes; then
+  grub_tmp_addr32="addr32"
+  grub_tmp_data32="data32"
+else
+  grub_tmp_addr32="addr32;"
+  grub_tmp_data32="data32;"
+fi
+
+ADDR32=$grub_tmp_addr32
+DATA32=$grub_tmp_data32
+
+AC_MSG_RESULT([$grub_cv_i386_asm_prefix_requirement])])
+
+
 dnl Check what symbol is defined as a bss start symbol.
 dnl Written by Michael Hohmoth and Yoshinori K. Okuji.
 AC_DEFUN([grub_CHECK_BSS_START_SYMBOL],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING([if __bss_start is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_uscore_bss_start_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);
-]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl __bss_start")]])],
 		[grub_cv_check_uscore_uscore_bss_start_symbol=yes],
 		[grub_cv_check_uscore_uscore_bss_start_symbol=no])])
@@ -230,11 +303,7 @@ AC_MSG_RESULT([$grub_cv_check_uscore_uscore_bss_start_symbol])
 
 AC_MSG_CHECKING([if edata is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_edata_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl edata")]])],
 		[grub_cv_check_edata_symbol=yes],
 		[grub_cv_check_edata_symbol=no])])
@@ -243,11 +312,7 @@ AC_MSG_RESULT([$grub_cv_check_edata_symbol])
 
 AC_MSG_CHECKING([if _edata is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_edata_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl _edata")]])],
 		[grub_cv_check_uscore_edata_symbol=yes],
 		[grub_cv_check_uscore_edata_symbol=no])])
@@ -271,11 +336,7 @@ AC_DEFUN([grub_CHECK_END_SYMBOL],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING([if end is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_end_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl end")]])],
 		[grub_cv_check_end_symbol=yes],
 		[grub_cv_check_end_symbol=no])])
@@ -284,11 +345,7 @@ AC_MSG_RESULT([$grub_cv_check_end_symbol])
 
 AC_MSG_CHECKING([if _end is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_end_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 		[[asm ("incl _end")]])],
 		[grub_cv_check_uscore_end_symbol=yes],
 		[grub_cv_check_uscore_end_symbol=no])])
@@ -423,3 +480,23 @@ dnl program.
 AC_DEFUN([grub_TRANSFORM],[dnl
 AC_SUBST(AS_TR_SH([$1]), [`AS_ECHO([$1]) | sed "$program_transform_name"`])dnl
 ])
+
+dnl Check if the C compiler supports `-mno-unaligned-access'.
+AC_DEFUN([grub_CHECK_NO_UNALIGNED_ACCESS],[
+[# foobar
+nua_possible=yes]
+AC_MSG_CHECKING([whether `$CC' supports `-mno-unaligned-access'])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+int main() {
+	return 0;
+}
+]])])
+
+[if eval "$ac_compile -S -mno-unaligned-access -o conftest.s" 2> /dev/null; then]
+  AC_MSG_RESULT([yes])
+  [rm -f conftest.s
+else
+  nua_possible=no]
+  AC_MSG_RESULT([no])
+[fi]
+])

autogen.sh

@@ -8,6 +8,8 @@ unset LC_ALL
 find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c'  ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in
 find util -iname '*.in' ! -name Makefile.in  |sort > po/POTFILES-shell.in
 
+autogen --version >/dev/null || exit 1
+
 echo "Importing unicode..."
 python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
 
@@ -30,7 +32,10 @@ for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul
     ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
 done
 
-echo "Generating Automake input..."
+echo "Creating Makefile.tpl..."
+python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+
+echo "Running autogen..."
 
 # Automake doesn't like including files from a path outside the project.
 rm -f contrib grub-core/contrib
@@ -54,8 +59,8 @@ for extra in contrib/*/Makefile.core.def; do
   fi
 done
 
-python gentpl.py $UTIL_DEFS > Makefile.util.am
-python gentpl.py $CORE_DEFS > grub-core/Makefile.core.am
+cat $UTIL_DEFS | autogen -T Makefile.tpl | sed -e '/^$/{N;/^\n$/D;}' > Makefile.util.am
+cat $CORE_DEFS | autogen -T Makefile.tpl | sed -e '/^$/{N;/^\n$/D;}' > grub-core/Makefile.core.am
 
 for extra in contrib/*/Makefile.common; do
   if test -e "$extra"; then

conf/Makefile.common

@@ -6,25 +6,22 @@ export LC_COLLATE := C
 unexport LC_ALL
 
 # Platform specific options
+if COND_mips_loongson
+  CFLAGS_PLATFORM += -mexplicit-relocs
+  CPPFLAGS_PLATFORM = -DUSE_ASCII_FALLBACK
+endif
+if COND_mips
+  CFLAGS_PLATFORM += -mflush-func=grub_red_herring
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
 if COND_sparc64_ieee1275
   CFLAGS_PLATFORM += -mno-app-regs
-  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -Wl,--no-relax
-endif
-if COND_sparc64_emu
-  CFLAGS_PLATFORM += -mno-app-regs
-  LDFLAGS_PLATFORM = -Wl,--no-relax
+  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -mno-relax
 endif
 if COND_arm
-if !COND_emu
+  CFLAGS_PLATFORM += -mthumb-interwork -mlong-calls
   LDFLAGS_PLATFORM = -Wl,--wrap=__clear_cache
 endif
-endif
-if COND_arm64
-  CFLAGS_PLATFORM += -mcmodel=large
-endif
-
-#FIXME: discover and check XEN headers
-CPPFLAGS_XEN = -I/usr/include
 
 # Other options
 
@@ -35,6 +32,7 @@ CPPFLAGS_DEFAULT += -I$(top_builddir)
 CPPFLAGS_DEFAULT += -I$(top_srcdir)
 CPPFLAGS_DEFAULT += -I$(top_srcdir)/include
 CPPFLAGS_DEFAULT += -I$(top_builddir)/include
+CPPFLAGS_DEFAULT += -I$(top_srcdir)/grub-core/lib/libgcrypt-grub/include
 CPPFLAGS_DEFAULT += -I$(top_srcdir)/grub-core/lib/libgcrypt-grub/src/
 CCASFLAGS_DEFAULT = $(CPPFLAGS_DEFAULT) -DASM_FILE=1
 BUILD_CPPFLAGS += $(CPPFLAGS_DEFAULT)
@@ -45,7 +43,11 @@ CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) $(TARGET_LDFLAGS_STATIC_LIBGCC)
 CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
 CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
+if COND_CYGWIN
+STRIPFLAGS_KERNEL = -F elf32-i386 -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
+else
+STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .note.gnu.gold-version
+endif
 
 CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
@@ -72,7 +74,7 @@ grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
 starfielddir = $(pkgdatadir)/themes/starfield
 
-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-old-style-definition
 CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib
 
 CFLAGS_POSIX = -fno-builtin
@@ -129,15 +131,20 @@ EXTRA_DIST =
 CLEANFILES =
 BUILT_SOURCES =
 
-# Rules for Automake input
+# Rules for autogen definition files
+
+.PRECIOUS: $(top_srcdir)/Makefile.tpl
+$(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
+	python $< | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+	mv $@.new $@
 
 .PRECIOUS: $(top_srcdir)/Makefile.util.am
-$(top_srcdir)/Makefile.util.am: $(top_srcdir)/gentpl.py $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def
-	python $^ > $@.new || (rm -f $@.new; exit 1)
+$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def $(top_srcdir)/Makefile.tpl
+	cat $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@
 
 .PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am
-$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/gentpl.py $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def
+$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def $(top_srcdir)/Makefile.tpl
 	if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./autogen.sh manually." >&2; exit 1; fi
-	python $^ > $@.new || (rm -f $@.new; exit 1)
+	cat $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@

conf/Makefile.extra-dist

@@ -2,6 +2,7 @@ EXTRA_DIST += autogen.sh
 EXTRA_DIST += geninit.sh
 
 EXTRA_DIST += gentpl.py
+EXTRA_DIST += Makefile.tpl
 EXTRA_DIST += Makefile.util.def
 EXTRA_DIST += Makefile.utilgcry.def
 
@@ -11,11 +12,9 @@ EXTRA_DIST += util/import_gcry.py
 EXTRA_DIST += util/import_unicode.py
 
 EXTRA_DIST += docs/man
-EXTRA_DIST += docs/autoiso.cfg
 EXTRA_DIST += docs/grub.cfg
-EXTRA_DIST += docs/osdetect.cfg
 
-EXTRA_DIST += conf/i386-cygwin-img-ld.sc
+EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
 
 EXTRA_DIST += grub-core/Makefile.core.def
 EXTRA_DIST += grub-core/Makefile.gcry.def
@@ -27,11 +26,6 @@ EXTRA_DIST += grub-core/gensymlist.sh
 EXTRA_DIST += grub-core/genemuinit.sh
 EXTRA_DIST += grub-core/genemuinitheader.sh
 
-EXTRA_DIST += grub-core/gnulib-fix-null-deref.diff
-EXTRA_DIST += grub-core/gnulib-fix-width.diff
-EXTRA_DIST += grub-core/gnulib-no-abort.diff
-EXTRA_DIST += grub-core/gnulib-no-gets.diff
-
 EXTRA_DIST += grub-core/lib/libgcrypt
 EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
 EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
@@ -109,4 +103,3 @@ EXTRA_DIST += grub-core/osdep/windows/sleep.c
 EXTRA_DIST += tests/dfly-mbr-mbexample.mbr.img.gz
 EXTRA_DIST += tests/dfly-mbr-mbexample.dfly.img.gz
 
-EXTRA_DIST += coreboot.cfg

conf/i386-pc-cygwin-img-ld.sc

@@ -5,8 +5,6 @@ SECTIONS
   .text :
   {
     start = . ;
-    _start = . ;
-    __start = . ;
     *(.text)
     etext = . ;
   }
@@ -35,8 +33,6 @@ SECTIONS
   {
     *(.edata)
     end = . ;
-    _end = . ;
-    __end = . ;
   }
   .stab :
   {

config.h.in

@@ -28,9 +28,12 @@
 #elif defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
 #include <config-util.h>
 #else
-#define HAVE_FONT_SOURCE @HAVE_FONT_SOURCE@
 /* Define if C symbols get an underscore after compilation. */
 #define HAVE_ASM_USCORE @HAVE_ASM_USCORE@
+/* Define it to \"addr32\" or \"addr32;\" to make GAS happy.  */
+#define ADDR32 @ADDR32@
+/* Define it to \"data32\" or \"data32;\" to make GAS happy. */
+#define DATA32 @DATA32@
 /* Define it to one of __bss_start, edata and _edata.  */
 #define BSS_START_SYMBOL @BSS_START_SYMBOL@
 /* Define it to either end or _end.  */
@@ -47,6 +50,12 @@
 #define PACKAGE_NAME "@PACKAGE_NAME@"
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
+/* Default boot directory name" */
+#define GRUB_BOOT_DIR_NAME "@bootdirname@"
+/* Default grub directory name */
+#define GRUB_DIR_NAME "@grubdirname@"
+/* Define to 1 if GCC generates calls to __register_frame_info().  */
+#define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@
 
 #define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
 #define GRUB_PLATFORM "@GRUB_PLATFORM@"

coreboot.cfg

@@ -1,3 +0,0 @@
-if test -f (cbfsdisk)/etc/grub.cfg; then
-   source (cbfsdisk)/etc/grub.cfg
-fi

docs/grub-dev.texi

@@ -79,7 +79,7 @@ This edition documents version @value{VERSION}.
 * Contributing Changes::
 * Porting::
 * Error Handling::
-* Stack and heap size::
+* CIA::
 * BIOS port memory map::
 * Video Subsystem::
 * PFF2 Font File Format::
@@ -92,36 +92,24 @@ This edition documents version @value{VERSION}.
 @node Getting the source code
 @chapter Getting the source code
 
-GRUB is maintained using the @uref{GIT revision
-control system}.  To fetch:
+GRUB is maintained using the @uref{http://bazaar-vcs.org/, Bazaar revision
+control system}.  To fetch the primary development branch:
 
 @example
-git clone git://git.sv.gnu.org/grub.git
+bzr get http://bzr.savannah.gnu.org/r/grub/trunk/grub
 @end example
 
-Web access is available under
+The GRUB developers maintain several other branches with work in progress.
+Of these, the most interesting is the experimental branch, which is a
+staging area for new code which we expect to eventually merge into trunk but
+which is not yet ready:
+
 @example
-http://git.savannah.gnu.org/cgit/grub.git/
+bzr get http://bzr.savannah.gnu.org/r/grub/branches/experimental
 @end example
 
-The branches available are:
-
-@table @samp
-@item master
-      Main developpement branch.
-@item grub-legacy
-      GRUB 0.97 codebase. Kept for reference and legal reasons
-@item multiboot
-      Multiboot specfication
-@item multiboot2
-      Multiboot2 specfication
-@item developper branches
-      Prefixed with developper name. Every developper of a team manages his own branches.
-      Developper branches do not need changelog entries.
-@end table
-
-Once you have used @kbd{git clone} to fetch an initial copy of a branch, you
-can use @kbd{git pull} to keep it up to date.  If you have modified your
+Once you have used @kbd{bzr get} to fetch an initial copy of a branch, you
+can use @kbd{bzr pull} to keep it up to date.  If you have modified your
 local version, you may need to resolve conflicts when pulling.
 
 @node Coding style
@@ -346,10 +334,10 @@ anymore.
 @itemize
 @item Always use latest GRUB 2 source code. So get that first.
 
-For developers it is recommended always to use the newest development version of GRUB 2. If development takes a long period of time, please remember to keep in sync with newest developments regularly so it is much easier to integrate your change in the future. GRUB 2 is being developed in a GIT repository.
+For developers it is recommended always to use the newest development version of GRUB 2. If development takes a long period of time, please remember to keep in sync with newest developments regularly so it is much easier to integrate your change in the future. GRUB 2 is being developed in a Bazaar (bzr) repository.
 
-Please check Savannah's GRUB project page for details how to get newest git:
-@uref{https://savannah.gnu.org/git/?group=grub, GRUB 2 git Repository}
+Please check Savannah's GRUB project page for details how to get newest bzr:
+@uref{http://savannah.gnu.org/bzr/?group=grub, GRUB 2 bzr Repository}
 
 @item Compile it and try it out.
 
@@ -907,68 +895,33 @@ if (grub_errno != GRUB_ERR_NONE)
 grub_error_pop ();
 @end example
 
-@node Stack and heap size
-@chapter Stack and heap size
+@node CIA
+@chapter CIA
+@c By Robert Millan and Carles Pina
+If you have commit access, please setup CIA in your Bazaar
+config so those in IRC receive notification of your commits.
 
-On emu stack and heap are just normal host OS stack and heap. Stack is typically
-8 MiB although it's OS-dependent.
+In @file{~/.bazaar/bazaar.conf}, add "cia_send_revno = true". 
+Optionally, you can also add "cia_user = myusername" if you'd
+like CIA service to use a specific account (for statistical purpose).
 
-On i386-pc, i386-coreboot, i386-qemu and i386-multiboot the stack is 60KiB.
-All available space between 1MiB and 4GiB marks is part of heap.
+In the @file{.bzr/branch/branch.conf} of your checkout branch,
+"set nickname = /path_to_this_branch" and "cia_project = GNU GRUB".
 
-On *-xen stack is 4MiB. If compiled for x86-64 with GCC 4.4 or later adressable
-space is unlimited. When compiled for x86-64 with older GCC version adressable
-space is limited to 2GiB. When compiling for i386 adressable space is limited
-to 4GiB. All adressable pages except the ones for stack, GRUB binary, special
-pages and page table are in the heap.
+Additionally, please set cia_send_revno in the [DEFAULT] section
+of your @file{~/.bazaar/bazaar.conf}. E.g.:
 
-On *-efi GRUB uses same stack as EFI. If compiled for x86-64 with GCC 4.4 or
-later adressable space is unlimited. When compiled for x86-64 with older GCC
-version adressable space is limited to 2GiB. For all other platforms adressable
-space is limited to 4GiB. GRUB allocates pages from EFI for its heap, at most
-1.6 GiB.
+@example
+[DEFAULT]
+cia_send_revno = true
+@end example
 
-On i386-ieee1275 and powerpc-ieee1275 GRUB uses same stack as IEEE1275.
-It allocates at most 32MiB for its heap.
-
-On sparc64-ieee1275 stack is 256KiB and heap is 2MiB.
-
-On mips(el)-qemu_mips and mipsel-loongson stack is 2MiB (everything below
-GRUB image) and everything above GRUB image (from 2MiB + kernel size)
-until 256MiB is part of heap.
-
-On mips-arc stack is 2MiB (everything below GRUB image) and everything above
-GRUB image(from 2MiB + kernel size) until 128MiB is part of heap.
-
-On mipsel-arc stack is 2MiB (everything below GRUB image which is not part
-of ARC) and everything above GRUB image (from 7MiB + kernel size)
-until 256MiB is part of heap.
-
-On arm-uboot stack is 256KiB and heap is 2MiB.
-
-In short:
-
-@multitable @columnfractions .15 .25 .5
-@headitem Platform @tab Stack @tab Heap
-@item emu                     @tab 8 MiB   @tab ?
-@item i386-pc                 @tab 60 KiB  @tab < 4 GiB
-@item i386-coreboot           @tab 60 KiB  @tab < 4 GiB
-@item i386-multiboot          @tab 60 KiB  @tab < 4 GiB
-@item i386-qemu               @tab 60 KiB  @tab < 4 GiB
-@item *-efi                   @tab ?       @tab < 1.6 GiB
-@item i386-ieee1275           @tab ?       @tab < 32 MiB
-@item powerpc-ieee1275        @tab ?       @tab < 32 MiB
-@item sparc64-ieee1275        @tab 256KiB  @tab 2 MiB
-@item arm-uboot               @tab 256KiB  @tab 2 MiB
-@item mips(el)-qemu_mips      @tab 2MiB    @tab 253 MiB
-@item mipsel-loongson         @tab 2MiB    @tab 253 MiB
-@item mips-arc                @tab 2MiB    @tab 125 MiB
-@item mipsel-arc              @tab 2MiB    @tab 248 MiB
-@item x86_64-xen (GCC >= 4.4) @tab 4MiB    @tab unlimited
-@item x86_64-xen (GCC < 4.4)  @tab 4MiB    @tab < 2GiB
-@item i386-xen                @tab 4MiB    @tab < 4GiB
-@end multitable
+Remember to install cia-clients (Debian/Ubuntu package) to be able to use CIA.
 
+Keep in mind Bazaar sends notifications for all commits to branches that have
+this setting, regardless of whether they're bound branches (checkouts) or not.
+So if you make local commits in a non-bound branch and it bothers you that
+others can read them, do not use this setting.
 
 @node BIOS port memory map
 @chapter BIOS port memory map
@@ -981,8 +934,9 @@ In short:
 @item ?        @tab 0x2000 - 1   @tab Real mode stack 
 @item 0x7C00   @tab 0x7D00 - 1   @tab Boot sector 
 @item 0x8000   @tab ?            @tab GRUB kernel 
-@item 0x68000  @tab 0x71000 - 1  @tab Disk buffer 
+@item 0x68000  @tab 0x78000 - 1  @tab Disk buffer 
 @item ?        @tab 0x80000 - 1  @tab Protected mode stack 
+@item 0x80000  @tab ?            @tab Heap 
 @item ?        @tab 0xA0000 - 1  @tab Extended BIOS Data Area 
 @item 0xA0000  @tab 0xC0000 - 1  @tab Video RAM 
 @item 0xC0000  @tab 0x100000 - 1 @tab BIOS 
@@ -1812,9 +1766,7 @@ right edges of two adjacent glyphs.  The @strong{device width} field determines
 the effective leading value that is used to render the font.
 
 @end itemize
-@ifnottex
-@image{font_char_metrics,,,,.png}
-@end ifnottex
+@image{font_char_metrics,,,,png}
    
 An illustration of how the various font metrics apply to characters.
 

docs/grub.texi

@@ -1277,9 +1277,8 @@ works it's not recommended since titles often contain unstable device names
 and may be translated
 
 If you set this to @samp{saved}, then the default menu entry will be that
-saved by @samp{GRUB_SAVEDEFAULT} or @command{grub-set-default}.  This relies on
-the environment block, which may not be available in all situations
-(@pxref{Environment block}).
+saved by @samp{GRUB_SAVEDEFAULT}, @command{grub-set-default}, or
+@command{grub-reboot}.
 
 The default is @samp{0}.
 
@@ -1288,7 +1287,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
 it as a new default entry for use by future runs of GRUB.  This is only
 useful if @samp{GRUB_DEFAULT=saved}; it is a separate option because
 @samp{GRUB_DEFAULT=saved} is useful without this option, in conjunction with
-@command{grub-set-default}.  Unset by default.
+@command{grub-set-default} or @command{grub-reboot}.  Unset by default.
 This option relies on the environment block, which may not be available in
 all situations (@pxref{Environment block}).
 
@@ -1298,26 +1297,23 @@ a key is pressed.  The default is @samp{5}.  Set to @samp{0} to boot
 immediately without displaying the menu, or to @samp{-1} to wait
 indefinitely.
 
-If @samp{GRUB_TIMEOUT_STYLE} is set to @samp{countdown} or @samp{hidden},
-the timeout is instead counted before the menu is displayed.
+@item GRUB_HIDDEN_TIMEOUT
+Wait this many seconds for @key{ESC} to be pressed before displaying the menu.
+If no @key{ESC} is pressed during that time, display the menu for the number of
+seconds specified in GRUB_TIMEOUT before booting the default entry. We expect
+that most people who use GRUB_HIDDEN_TIMEOUT will want to have GRUB_TIMEOUT set 
+to @samp{0} so that the menu is not displayed at all unless @key{ESC} is
+pressed.
+Unset by default.
 
-@item GRUB_TIMEOUT_STYLE
-If this option is unset or set to @samp{menu}, then GRUB will display the
-menu and then wait for the timeout set by @samp{GRUB_TIMEOUT} to expire
-before booting the default entry.  Pressing a key interrupts the timeout.
-
-If this option is set to @samp{countdown} or @samp{hidden}, then, before
-displaying the menu, GRUB will wait for the timeout set by
-@samp{GRUB_TIMEOUT} to expire.  If @key{ESC} is pressed during that time, it
-will display the menu and wait for input.  If a hotkey associated with a
-menu entry is pressed, it will boot the associated menu entry immediately.
-If the timeout expires before either of these happens, it will boot the
-default entry.  In the @samp{countdown} case, it will show a one-line
-indication of the remaining time.
+@item GRUB_HIDDEN_TIMEOUT_QUIET
+In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to
+suppress the verbose countdown while waiting for a key to be pressed before
+displaying the menu.  Unset by default.
 
 @item GRUB_DEFAULT_BUTTON
 @itemx GRUB_TIMEOUT_BUTTON
-@itemx GRUB_TIMEOUT_STYLE_BUTTON
+@itemx GRUB_HIDDEN_TIMEOUT_BUTTON
 @itemx GRUB_BUTTON_CMOS_ADDRESS
 Variants of the corresponding variables without the @samp{_BUTTON} suffix,
 used to support vendor-specific power buttons.  @xref{Vendor power-on keys}.
@@ -1454,22 +1450,6 @@ Normally, @command{grub-mkconfig} will try to use the external
 systems installed on the same system and generate appropriate menu entries
 for them.  Set this option to @samp{true} to disable this.
 
-@item GRUB_OS_PROBER_SKIP_LIST
-List of space-separated FS UUIDs of filesystems to be ignored from os-prober
-output. For efi chainloaders it's <UUID>@@<EFI FILE>
-
-@item GRUB_DISABLE_SUBMENU
-Normally, @command{grub-mkconfig} will generate top level menu entry for
-the kernel with highest version number and put all other found kernels
-or alternative menu entries for recovery mode in submenu. For entries returned
-by @command{os-prober} first entry will be put on top level and all others
-in submenu. If this option is set to @samp{y}, flat menu with all entries
-on top level will be generated instead. Changing this option will require
-changing existing values of @samp{GRUB_DEFAULT}, @samp{fallback} (@pxref{fallback})
-and @samp{default} (@pxref{default}) environment variables as well as saved
-default entry using @command{grub-set-default} and value used with
-@command{grub-reboot}.
-
 @item GRUB_ENABLE_CRYPTODISK
 If set to @samp{y}, @command{grub-mkconfig} and @command{grub-install} will
 check for encrypted disks and generate additional commands needed to access
@@ -1492,44 +1472,6 @@ Each module will be loaded as early as possible, at the start of
 
 @end table
 
-The following options are still accepted for compatibility with existing
-configurations, but have better replacements:
-
-@table @samp
-@item GRUB_HIDDEN_TIMEOUT
-Wait this many seconds before displaying the menu.  If @key{ESC} is pressed
-during that time, display the menu and wait for input according to
-@samp{GRUB_TIMEOUT}.  If a hotkey associated with a menu entry is pressed,
-boot the associated menu entry immediately.  If the timeout expires before
-either of these happens, display the menu for the number of seconds
-specified in @samp{GRUB_TIMEOUT} before booting the default entry.
-
-If you set @samp{GRUB_HIDDEN_TIMEOUT}, you should also set
-@samp{GRUB_TIMEOUT=0} so that the menu is not displayed at all unless
-@key{ESC} is pressed.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
-@samp{GRUB_TIMEOUT_STYLE=hidden}.
-
-@item GRUB_HIDDEN_TIMEOUT_QUIET
-In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to
-suppress the verbose countdown while waiting for a key to be pressed before
-displaying the menu.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown}.
-
-@item GRUB_HIDDEN_TIMEOUT_BUTTON
-Variant of @samp{GRUB_HIDDEN_TIMEOUT}, used to support vendor-specific power
-buttons.  @xref{Vendor power-on keys}.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
-@samp{GRUB_TIMEOUT_STYLE=hidden}.
-
-@end table
-
 For more detailed customisation of @command{grub-mkconfig}'s output, you may
 edit the scripts in @file{/etc/grub.d} directly.
 @file{/etc/grub.d/40_custom} is particularly useful for adding entire custom
@@ -2518,16 +2460,15 @@ menu requires several fancy features of your terminal.
 @node Vendor power-on keys
 @chapter Using GRUB with vendor power-on keys
 
-Some laptop vendors provide an additional power-on button which boots
-another OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
-@samp{GRUB_TIMEOUT_STYLE_BUTTON}, @samp{GRUB_DEFAULT_BUTTON}, and
+Some laptop vendors provide an additional power-on button which boots another
+OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
+@samp{GRUB_DEFAULT_BUTTON}, @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} and
 @samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple
-configuration}).  @samp{GRUB_TIMEOUT_BUTTON},
-@samp{GRUB_TIMEOUT_STYLE_BUTTON}, and @samp{GRUB_DEFAULT_BUTTON} are used
-instead of the corresponding variables without the @samp{_BUTTON} suffix
-when powered on using the special button.  @samp{GRUB_BUTTON_CMOS_ADDRESS}
-is vendor-specific and partially model-specific.  Values known to the GRUB
-team are:
+configuration}).  @samp{GRUB_TIMEOUT_BUTTON}, @samp{GRUB_DEFAULT_BUTTON} and
+@samp{GRUB_HIDDEN_TIMEOUT_BUTTON} are used instead of the corresponding
+variables without the @samp{_BUTTON} suffix when powered on using the special
+button.  @samp{GRUB_BUTTON_CMOS_ADDRESS} is vendor-specific and partially
+model-specific.  Values known to the GRUB team are:
 
 @table @key
 @item Dell XPS M1330M
@@ -2711,7 +2652,6 @@ Heavily limited platforms:
 Lightly limited platforms:
 
 @itemize
-@item *-xen: limited only by adress space and RAM size.
 @item i386-qemu: kernel.img (.text + .data + .bss) is limited by 392704 bytes.
                  (core.img would be limited by ROM size but it's unlimited on qemu
 @item All EFI platforms: limited by contiguous RAM size and possibly firmware bugs
@@ -2767,9 +2707,9 @@ by a digit, like @samp{fd0}, or @samp{cd}.
 AHCI, PATA (ata), crypto, USB use the name of driver followed by a number.
 Memdisk and host are limited to one disk and so it's refered just by driver
 name.
-RAID (md), ofdisk (ieee1275 and nand), LVM (lvm), LDM, virtio (vdsk)
-and arcdisk (arc) use intrinsic name of disk prefixed by driver name.
-Additionally just ``nand'' refers to the disk aliased as ``nand''.
+RAID (md), ofdisk (ieee1275 and nand), LVM (lvm), LDM and arcdisk (arc) use
+intrinsic name of disk prefixed by driver name. Additionally just ``nand''
+refers to the disk aliased as ``nand''.
 Conflicts are solved by suffixing a number if necessarry.
 Commas need to be escaped.
 Loopback uses whatever name specified to @command{loopback} command.
@@ -3035,7 +2975,6 @@ These variables have special meaning to GRUB.
 * biosnum::
 * check_signatures::
 * chosen::
-* cmdpath::
 * color_highlight::
 * color_normal::
 * debug::
@@ -3072,7 +3011,6 @@ These variables have special meaning to GRUB.
 * superusers::
 * theme::
 * timeout::
-* timeout_style::
 @end menu
 
 
@@ -3106,16 +3044,6 @@ the titles of each of the submenus starting from the top level followed by
 the title of the menu entry itself, separated by @samp{>}.
 
 
-@node cmdpath
-@subsection cmdpath
-
-The location from which @file{core.img} was loaded as an absolute
-directory name (@pxref{File name syntax}).  This is set by GRUB at
-startup based on information returned by platform firmware.  Not every
-platform provides this information and some may return only device
-without path name.
-
-
 @node color_highlight
 @subsection color_highlight
 
@@ -3123,7 +3051,7 @@ This variable contains the ``highlight'' foreground and background terminal
 colors, separated by a slash (@samp{/}).  Setting this variable changes
 those colors.  For the available color names, @pxref{color_normal}.
 
-The default is @samp{black/light-gray}.
+The default is @samp{black/white}.
 
 
 @node color_normal
@@ -3152,7 +3080,7 @@ those colors.  Each color must be a name from the following list:
 @item white
 @end itemize
 
-The default is @samp{light-gray/black}.
+The default is @samp{white/black}.
 
 The color support support varies from terminal to terminal.
 
@@ -3505,21 +3433,8 @@ keyboard input before booting the default menu entry.  A timeout of @samp{0}
 means to boot the default entry immediately without displaying the menu; a
 timeout of @samp{-1} (or unset) means to wait indefinitely.
 
-If @samp{timeout_style} (@pxref{timeout_style}) is set to @samp{countdown}
-or @samp{hidden}, the timeout is instead counted before the menu is
-displayed.
-
-This variable is often set by @samp{GRUB_TIMEOUT} (@pxref{Simple
-configuration}).
-
-
-@node timeout_style
-@subsection timeout_style
-
-This variable may be set to @samp{menu}, @samp{countdown}, or @samp{hidden}
-to control the way in which the timeout (@pxref{timeout}) interacts with
-displaying the menu.  See the documentation of @samp{GRUB_TIMEOUT_STYLE}
-(@pxref{Simple configuration}) for details.
+This variable is often set by @samp{GRUB_TIMEOUT} or
+@samp{GRUB_HIDDEN_TIMEOUT} (@pxref{Simple configuration}).
 
 
 @node Environment block
@@ -4476,7 +4391,7 @@ List devices or files.
 With no arguments, print all devices known to GRUB.
 
 If the argument is a device name enclosed in parentheses (@pxref{Device
-syntax}), then print the name of the filesystem of that device.
+syntax}), then list all files at the root directory of that device.
 
 If the argument is a directory given as an absolute file name (@pxref{File
 name syntax}), then list the contents of that directory.
@@ -4939,8 +4854,7 @@ Alias for @code{hashsum --hash sha512 arg @dots{}}. See command @command{hashsum
 @deffn Command sleep [@option{--verbose}] [@option{--interruptible}] count
 Sleep for @var{count} seconds. If option @option{--interruptible} is given,
 allow @key{ESC} to interrupt sleep. With @option{--verbose} show countdown
-of remaining seconds. Exit code is set to 0 if timeout expired and to 1
-if timeout was interrupted by @key{ESC}.
+of remaining seconds.
 @end deffn
 
 
@@ -5277,14 +5191,12 @@ is given, use default list of servers.
 
 
 @node Internationalisation
-@chapter Internationalisation
-
-@section Charset
+@chapter Charset
 GRUB uses UTF-8 internally other than in rendering where some GRUB-specific
 appropriate representation is used. All text files (including config) are
 assumed to be encoded in UTF-8.
 
-@section Filesystems
+@chapter Filesystems
 NTFS, JFS, UDF, HFS+, exFAT, long filenames in FAT, Joliet part of
 ISO9660 are treated as UTF-16 as per specification. AFS and BFS are read
 as UTF-8, again according to specification. BtrFS, cpio, tar, squash4, minix,
@@ -5318,7 +5230,7 @@ treated as distinct from u+combining diaresis. This however means that in
 order to access file on HFS+ its name must be specified in normalisation form D.
 On normalized ZFS subvolumes filenames out of normalisation are inaccessible.
 
-@section Output terminal
+@chapter Output terminal
 Firmware output console ``console'' on ARC and IEEE1275 are limited to ASCII.
 
 BIOS firmware console and VGA text are limited to ASCII and some pseudographics.
@@ -5352,7 +5264,7 @@ called ``annotation characters'' If you can complete either of
 two lists or, better, propose a patch to improve rendering, please contact
 developer team.
 
-@section Input terminal
+@chapter Input terminal
 Firmware console on BIOS, IEEE1275 and ARC doesn't allow you to enter non-ASCII
 characters. EFI specification allows for such but author is unaware of any
 actual implementations. Serial input is currently limited for latin1 (unlikely
@@ -5362,15 +5274,15 @@ So no dead keys or advanced input method. Also there is no keymap change hotkey.
 In practice it makes difficult to enter any text using non-Latin alphabet.
 Moreover all current input consumers are limited to ASCII.
 
-@section Gettext
+@chapter Gettext
 GRUB supports being translated. For this you need to have language *.mo files in $prefix/locale, load gettext module and set ``lang'' variable.
 
-@section Regexp
+@chapter Regexp
 Regexps work on unicode characters, however no attempt at checking cannonical
 equivalence has been made. Moreover the classes like [:alpha:] match only
 ASCII subset.
 
-@section Other
+@chapter Other
 Currently GRUB always uses YEAR-MONTH-DAY HOUR:MINUTE:SECOND [WEEKDAY] 24-hour
 datetime format but weekdays are translated.
 GRUB always uses the decimal number format with [0-9] as digits and . as
@@ -5840,7 +5752,7 @@ X86 support is summarised in the following table. ``Yes'' means that the kernel
 PowerPC, IA64 and Sparc64 ports support only Linux. MIPS port supports Linux
 and multiboot2.
 
-@section Boot tests
+@chapter Boot tests
 
 As you have seen in previous chapter the support matrix is pretty big and some of the configurations are only rarely used. To ensure the quality bootchecks are available for all x86 targets except EFI chainloader, Appleloader and XNU. All x86 platforms have bootcheck facility except ieee1275. Multiboot, multiboot2, BIOS chainloader, ntldr and freebsd-bootloader boot targets are tested only with a fake kernel images. Only Linux is tested among the payloads using Linux protocols.
 
@@ -5994,21 +5906,9 @@ mounted on
 Recheck the device map, even if @file{/boot/grub/device.map} already
 exists. You should use this option whenever you add/remove a disk
 into/from your computer.
-
-@item --no-rs-codes
-By default on x86 BIOS systems, @command{grub-install} will use some
-extra space in the bootloader embedding area for Reed-Solomon
-error-correcting codes. This enables GRUB to still boot successfully
-if some blocks are corrupted.  The exact amount of protection offered
-is dependent on available space in the embedding area.  R sectors of
-redundancy can tolerate up to R/2 corrupted sectors. This
-redundancy may be cumbersome if attempting to cryptographically
-validate the contents of the bootloader embedding area, or in more
-modern systems with GPT-style partition tables (@pxref{BIOS
-installation}) where GRUB does not reside in any unpartitioned space
-outside of the MBR.  Disable the Reed-Solomon codes with this option.
 @end table
 
+
 @node Invoking grub-mkconfig
 @chapter Invoking grub-mkconfig
 
@@ -6385,7 +6285,7 @@ just do:
 @end group
 @end example
 
-Also, the latest version is available using Git. See
+Also, the latest version is available using Bazaar. See
 @uref{http://www.gnu.org/software/grub/grub-download.html} for more
 information.
 

docs/man/grub-file.h2m

@@ -1,2 +0,0 @@
-[NAME]
-grub-file \- check file type

docs/man/grub-macbless.h2m

@@ -1,4 +0,0 @@
-[NAME]
-grub-macbless \- bless a mac file/directory
-[SEE ALSO]
-.BR grub-install (1)

docs/man/grub-syslinux2cfg.h2m

@@ -1,4 +0,0 @@
-[NAME]
-grub-syslinux2cfg \- transform syslinux config into grub.cfg
-[SEE ALSO]
-.BR grub-menulst2cfg (8)

docs/osdetect.cfg

@@ -178,12 +178,6 @@ for dev in (*); do
     # uuid: filesystem UUID
     probe -s uuid -u $dev
 
-    if test -f ($device)/isolinux/isolinux.cfg ; then
-	menuentry "ISOLINUX config (on $device)" $device {
-	    set root=$2
-	    syslinux_configfile -i /isolinux/isolinux.cfg
-	}
-    fi
     if test -f ($device)/bootmgr -a -f ($device)/boot/bcd; then
 	menuentry "Windows Vista bootmgr (on $device)" $device {
 	    set root=$2

grub-core/Makefile.am

@@ -10,6 +10,10 @@ CCAS=$(TARGET_CC)
 RANLIB=$(TARGET_RANLIB)
 STRIP=$(TARGET_STRIP)
 
+if COND_HAVE_FONT_SOURCE
+TARGET_CFLAGS += -DUSE_ASCII_FALLBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1
+endif
+
 MACHO2IMG=$(top_builddir)/grub-macho2img
 
 AM_CFLAGS = $(TARGET_CFLAGS)
@@ -26,11 +30,8 @@ CFLAGS_LIBRARY += $(CFLAGS_PLATFORM) -fno-builtin
 CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM)
 CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)
 
-build-grub-pep2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=64 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pep2elf\" $^
-
 build-grub-pe2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=32 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
 
 # gentrigtables
 gentrigtables: gentrigtables.c
@@ -103,6 +104,7 @@ endif
 if COND_i386_coreboot
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/coreboot/lbio.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/i386/pc/int.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
@@ -112,6 +114,7 @@ endif
 
 if COND_i386_multiboot
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/i386/pc/int.h
 endif
 
 if COND_i386_qemu
@@ -127,24 +130,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 endif
 
-if COND_i386_xen
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/xen.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/xen/hypercall.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-endif
-
-if COND_x86_64_xen
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/xen.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/x86_64/xen/hypercall.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-endif
-
 if COND_x86_64_efi
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
@@ -157,6 +142,12 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 endif
 
+if COND_alpha_srm
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/alpha/divide.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+endif
+
 if COND_mips
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/kernel.h
 endif
@@ -170,6 +161,7 @@ endif
 if COND_mips_qemu_mips
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/serial.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
@@ -181,6 +173,7 @@ if COND_mips_loongson
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
@@ -221,19 +214,12 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/uboot/uboot.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/uboot/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
 endif
 
 if COND_arm_efi
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
-endif
-
-if COND_arm64_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 endif
 
 if COND_emu
@@ -390,44 +376,43 @@ CLEANFILES += $(MOD_FILES)
 
 if COND_ENABLE_EFIEMU
 efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
-	-rm -f $@
-	-rm -f $@.bin
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -static -O2 -c -o $@.bin $<
-	if test "x$(TARGET_APPLE_LINKER)" = x1; then \
-	  $(TARGET_OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
-	  rm -f $@.bin ; \
-	elif test ! -z "$(TARGET_OBJ2ELF)"; then \
-	  $(TARGET_OBJ2ELF) $@.bin || (rm -f $@.bin; exit 1); \
-	  mv $@.bin $@ ; \
-	else \
-	  mv $@.bin $@ ; \
-	fi
-
-# Link format -arch,x86_64 means Apple linker
-efiemu64_c.o: efiemu/runtime/efiemu.c
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
-
-efiemu64_s.o: efiemu/runtime/efiemu.S
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
-
-efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
-	-rm -f $@
-	-rm -f $@.bin
-	$(TARGET_CC) -m64 $(EFIEMU64_LINK_FORMAT) -nostdlib -static -Wl,-r -o $@.bin $^
-	if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
-	  $(TARGET_OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
+	-rm -f $@; \
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF32 -DAPPLE_CC -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \
+	  $(OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
 	  rm -f $@.bin; \
 	else \
-	  mv $@.bin $@ ; \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF32 -m32 -Wall -Werror -nostdlib -O2 -c -o $@ $< || exit 1; \
+	  if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+	fi
+
+efiemu64_c.o: efiemu/runtime/efiemu.c
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -DAPPLE_CC=1 -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+	fi
+
+efiemu64_s.o: efiemu/runtime/efiemu.S
+	-rm -f $@
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -DAPPLE_CC=1 -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+	fi
+
+efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
+	-rm -f $@; \
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  rm -f $@.bin; \
+	  $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \
+	  $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
+	  rm -f $@.bin; \
+	else \
+	  $(TARGET_CC) -m64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
+	  if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
 	fi
 
 platform_DATA += efiemu32.o efiemu64.o
 CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o
 endif
-
-windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows
-windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
-	test -d $(windowsdir)/$(target_cpu)-$(platform) || mkdir $(windowsdir)/$(target_cpu)-$(platform)
-	for x in $(platform_DATA); do \
-		cp -fp $$x $(windowsdir)/$(target_cpu)-$(platform)/$$x; \
-	done

grub-core/Makefile.core.def

@@ -59,39 +59,31 @@ kernel = {
   ia64_efi_ldflags = '-Wl,-r,-d';
   ia64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
 
-  x86_64_xen_cppflags	   = '$(CPPFLAGS_XEN)';
-  i386_xen_cppflags	   = '$(CPPFLAGS_XEN)';
-
   arm_efi_ldflags          = '-Wl,-r,-d';
   arm_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
 
-  arm64_efi_ldflags          = '-Wl,-r,-d';
-  arm64_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
-
   i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
   i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x9000';
+
   i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
   i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_coreboot_ldflags    = '$(TARGET_IMG_LDFLAGS)';
-  i386_coreboot_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_multiboot_ldflags   = '$(TARGET_IMG_LDFLAGS)';
-  i386_multiboot_ldflags   = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_ieee1275_ldflags    = '$(TARGET_IMG_LDFLAGS)';
-  i386_ieee1275_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x10000';
-  i386_xen_ldflags         = '$(TARGET_IMG_LDFLAGS)';
-  i386_xen_ldflags         = '$(TARGET_IMG_BASE_LDOPT),0';
-  x86_64_xen_ldflags       = '$(TARGET_IMG_LDFLAGS)';
-  x86_64_xen_ldflags       = '$(TARGET_IMG_BASE_LDOPT),0';
 
   ldadd = '$(LDADD_KERNEL)';
 
+  alpha_srm_cflags = '-mcpu=ev4 -mno-fp-regs -ffixed-8';
+
+  i386_coreboot_ldflags    = '-Wl,-Ttext=0x8200';
+  i386_multiboot_ldflags   = '-Wl,-Ttext=0x8200';
+  i386_ieee1275_ldflags    = '-Wl,-Ttext=0x10000';
   mips_loongson_ldflags    = '-Wl,-Ttext,0x80200000';
   powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
   sparc64_ieee1275_ldflags = '-Wl,-Ttext,0x4400';
   mips_arc_ldflags    = '-Wl,-Ttext,$(TARGET_LINK_ADDR)';
   mips_qemu_mips_ldflags    = '-Wl,-Ttext,0x80200000';
+  alpha_srm_ldflags    = '-Wl,-Ttext,0x20000000';
 
   mips_arc_cppflags = '-DGRUB_DECOMPRESSOR_LINK_ADDR=$(TARGET_DECOMPRESSOR_LINK_ADDR)';
+  mips_loongson_cppflags = '-DUSE_ASCII_FALLBACK';
   i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
   emu_cflags = '$(CFLAGS_GNULIB)';
   emu_cppflags = '$(CPPFLAGS_GNULIB)';
@@ -101,8 +93,6 @@ kernel = {
   i386_pc_startup = kern/i386/pc/startup.S;
   i386_efi_startup = kern/i386/efi/startup.S;
   x86_64_efi_startup = kern/x86_64/efi/startup.S;
-  i386_xen_startup = kern/i386/xen/startup.S;
-  x86_64_xen_startup = kern/x86_64/xen/startup.S;
   i386_qemu_startup = kern/i386/qemu/startup.S;
   i386_ieee1275_startup = kern/i386/ieee1275/startup.S;
   i386_coreboot_startup = kern/i386/coreboot/startup.S;
@@ -110,9 +100,9 @@ kernel = {
   mips_startup = kern/mips/startup.S;
   sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
   powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
+  alpha_srm_startup = kern/alpha/srm/startup.S;
   arm_uboot_startup = kern/arm/uboot/startup.S;
   arm_efi_startup = kern/arm/efi/startup.S;
-  arm64_efi_startup = kern/arm64/efi/startup.S;
 
   common = kern/command.c;
   common = kern/corecmd.c;
@@ -139,6 +129,7 @@ kernel = {
   noemu_nodist = symlist.c;
 
   mips = kern/generic/rtc_get_time_ms.c;
+  alpha_srm = kern/generic/rtc_get_time_ms.c;
 
   ieee1275 = disk/ieee1275/ofdisk.c;
   ieee1275 = kern/ieee1275/cmain.c;
@@ -160,7 +151,6 @@ kernel = {
   terminfoinkernel = lib/arg.c;
 
   i386 = kern/i386/dl.c;
-  i386_xen = kern/i386/dl.c;
 
   i386_coreboot = kern/i386/coreboot/init.c;
   i386_multiboot = kern/i386/coreboot/init.c;
@@ -179,31 +169,19 @@ kernel = {
   i386_efi = kern/i386/efi/init.c;
   i386_efi = bus/pci.c;
 
-  x86_64 = kern/x86_64/dl.c;
-  x86_64_xen = kern/x86_64/dl.c;
+  x86_64_efi = kern/x86_64/dl.c;
   x86_64_efi = kern/x86_64/efi/callwrap.S;
   x86_64_efi = kern/i386/efi/init.c;
   x86_64_efi = bus/pci.c;
 
-  xen = kern/i386/tsc.c;
-  x86_64_xen = kern/x86_64/xen/hypercall.S;
-  i386_xen = kern/i386/xen/hypercall.S;
-  xen = kern/xen/init.c;
-  xen = term/xen/console.c;
-  xen = disk/xen/xendisk.c;
-  xen = commands/boot.c;
-
   ia64_efi = kern/ia64/efi/startup.S;
   ia64_efi = kern/ia64/efi/init.c;
   ia64_efi = kern/ia64/dl.c;
   ia64_efi = kern/ia64/dl_helper.c;
-  ia64_efi = kern/ia64/cache.c;
 
   arm_efi = kern/arm/efi/init.c;
   arm_efi = kern/arm/efi/misc.c;
 
-  arm64_efi = kern/arm/efi/init.c;
-
   i386_pc = kern/i386/pc/init.c;
   i386_pc = kern/i386/pc/mmap.c;
   i386_pc = term/i386/pc/console.c;
@@ -245,7 +223,6 @@ kernel = {
   mips_loongson = video/sm712.c;
   mips_loongson = video/sis315pro.c;
   mips_loongson = video/radeon_fuloong2e.c;
-  mips_loongson = video/radeon_yeeloong3a.c;
   extra_dist = video/sm712_init.c;
   extra_dist = video/sis315_init.c;
   mips_loongson = commands/keylayouts.c;
@@ -265,10 +242,15 @@ kernel = {
   arm = kern/arm/cache.c;
   arm = kern/arm/misc.S;
 
-  arm64 = kern/arm64/cache.c;
-  arm64 = kern/arm64/cache_flush.S;
-  arm64 = kern/arm64/dl.c;
-  arm64 = kern/arm64/dl_helper.c;
+  alpha_srm = kern/alpha/srm/dispatch.S;
+  alpha_srm = kern/alpha/dl.c;
+  alpha_srm = kern/alpha/cache.S;
+  alpha_srm = kern/alpha/divide.S;
+  alpha_srm = kern/alpha/srm/pal_init.c;
+  alpha_srm = kern/alpha/srm/init.c;
+  alpha_srm = term/alpha/srm/console.c;
+  alpha_srm = disk/alpha/srm/srmdisk.c;
+  alpha_srm = commands/boot.c;
 
   emu = disk/host.c;
   emu = kern/emu/cache_s.S;
@@ -288,9 +270,6 @@ kernel = {
   emu = osdep/emuconsole.c;
   extra_dist = osdep/unix/emuconsole.c;
   extra_dist = osdep/windows/emuconsole.c;
-  emu = osdep/dl.c;
-  extra_dist = osdep/unix/dl.c;
-  extra_dist = osdep/windows/dl.c;
   emu = osdep/sleep.c;
   emu = osdep/init.c;
   emu = osdep/emunet.c;
@@ -582,7 +561,6 @@ module = {
 module = {
   name = pci;
   common = bus/pci.c;
-  i386_ieee1275 = bus/i386/ieee1275/pci.c;
 
   enable = i386_pc;
   enable = i386_ieee1275;
@@ -616,11 +594,15 @@ module = {
 };
 
 module = {
-  name = lsxen;
-  common = commands/xen/lsxen.c;
-  cppflags = '$(CPPFLAGS_XEN)';
+  name = check_nt_hiberfil;
+  common = commands/i386/nthibr.c;
+};
 
-  enable = xen;
+library = {
+  name = libgnulib.a;
+  common = gnulib/regex.c;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
 };
 
 module = {
@@ -674,7 +656,8 @@ module = {
   name = regexp;
   common = commands/regexp.c;
   common = commands/wildcard.c;
-  common = gnulib/regex.c;
+  ldadd = libgnulib.a;
+  dependencies = libgnulib.a;
   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
 };
@@ -757,7 +740,6 @@ module = {
   enable = mips_arc;
   enable = ia64_efi;
   enable = arm_efi;
-  enable = arm64_efi;
   enable = arm_uboot;
 };
 
@@ -778,10 +760,8 @@ module = {
 
 module = {
   name = cpuid;
-  common = commands/i386/cpuid.c;
+  x86 = commands/i386/cpuid.c;
   enable = x86;
-  enable = i386_xen;
-  enable = x86_64_xen;
 };
 
 module = {
@@ -838,10 +818,10 @@ module = {
   i386_multiboot = lib/i386/halt.c;
   i386_coreboot = lib/i386/halt.c;
   i386_qemu = lib/i386/halt.c;
-  xen = lib/xen/halt.c;
-  xen_cppflags = '$(CPPFLAGS_XEN)';
   efi = lib/efi/halt.c;
   ieee1275 = lib/ieee1275/halt.c;
+  alpha_srm = lib/alpha/srm/halt.c;
+
   emu = lib/emu/halt.c;
   uboot = lib/uboot/halt.c;
 };
@@ -853,15 +833,13 @@ module = {
   ia64_efi = lib/efi/reboot.c;
   x86_64_efi = lib/efi/reboot.c;
   arm_efi = lib/efi/reboot.c;
-  arm64_efi = lib/efi/reboot.c;
   powerpc_ieee1275 = lib/ieee1275/reboot.c;
   sparc64_ieee1275 = lib/ieee1275/reboot.c;
   mips_arc = lib/mips/arc/reboot.c;
   mips_loongson = lib/mips/loongson/reboot.c;
   mips_qemu_mips = lib/mips/qemu_mips/reboot.c;
-  xen = lib/xen/reboot.c;
-  xen_cppflags = '$(CPPFLAGS_XEN)';
   uboot = lib/uboot/reboot.c;
+  alpha_srm = lib/alpha/srm/reboot.c;
   common = commands/reboot.c;
 };
 
@@ -1399,11 +1377,6 @@ module = {
   common = fs/tar.c;
 };
 
-module = {
-  name = greffs;
-  common = fs/greffs.c;
-};
-
 module = {
   name = udf;
   common = fs/udf.c;
@@ -1448,11 +1421,6 @@ module = {
   common = fs/zfs/zfsinfo.c;
 };
 
-module = {
-  name = macbless;
-  common = commands/macbless.c;
-};
-
 module = {
   name = pxe;
   i386_pc = net/drivers/i386/pc/pxe.c;
@@ -1494,11 +1462,6 @@ module = {
   common = io/gzio.c;
 };
 
-module = {
-  name = offsetio;
-  common = io/offset.c;
-};
-
 module = {
   name = bufio;
   common = io/bufio.c;
@@ -1532,21 +1495,13 @@ module = {
   x86 = lib/i386/relocator64.S;
   i386 = lib/i386/relocator_asm.S;
   x86_64 = lib/x86_64/relocator_asm.S;
-  i386_xen = lib/i386/relocator_asm.S;
-  x86_64_xen = lib/x86_64/relocator_asm.S;
   x86 = lib/i386/relocator.c;
-  x86 = lib/i386/relocator_common_c.c;
   ieee1275 = lib/ieee1275/relocator.c;
   efi = lib/efi/relocator.c;
   mips = lib/mips/relocator_asm.S;
   mips = lib/mips/relocator.c;
   powerpc = lib/powerpc/relocator_asm.S;
   powerpc = lib/powerpc/relocator.c;
-  xen = lib/xen/relocator.c;
-  i386_xen = lib/i386/xen/relocator.S;
-  x86_64_xen = lib/x86_64/xen/relocator.S;
-  xen = lib/i386/relocator_common_c.c;
-  xen_cppflags = '$(CPPFLAGS_XEN)';
 
   extra_dist = lib/i386/relocator_common.S;
   extra_dist = kern/powerpc/cache_flush.S;
@@ -1554,7 +1509,6 @@ module = {
   enable = mips;
   enable = powerpc;
   enable = x86;
-  enable = xen;
 };
 
 module = {
@@ -1566,10 +1520,9 @@ module = {
   powerpc_ieee1275 = lib/ieee1275/datetime.c;
   sparc64_ieee1275 = lib/ieee1275/cmos.c;
   powerpc_ieee1275 = lib/ieee1275/cmos.c;
-  xen = lib/xen/datetime.c;
-  xen_cppflags = '$(CPPFLAGS_XEN)';
 
   mips_arc = lib/arc/datetime.c;
+  alpha_srm = lib/alpha/srm/datetime.c;
   enable = noemu;
 };
 
@@ -1583,8 +1536,7 @@ module = {
   extra_dist = lib/powerpc/setjmp.S;
   extra_dist = lib/ia64/setjmp.S;
   extra_dist = lib/ia64/longjmp.S;
-  extra_dist = lib/arm/setjmp.S;
-  extra_dist = lib/arm64/setjmp.S;
+  extra_dist = lib/alpha/setjmp.S;
 };
 
 module = {
@@ -1626,14 +1578,6 @@ module = {
   enable = i386_pc;
 };
 
-
-module = {
-  name = truecrypt;
-  i386_pc = loader/i386/pc/truecrypt.c;
-  enable = i386_pc;
-};
-
-
 module = {
   name = freedos;
   i386_pc = loader/i386/pc/freedos.c;
@@ -1651,7 +1595,6 @@ module = {
   cppflags = "-DGRUB_USE_MULTIBOOT2";
 
   common = loader/multiboot.c;
-  common = lib/cmdline.c;
   common = loader/multiboot_mbi2.c;
   enable = x86;
   enable = mips;
@@ -1660,7 +1603,6 @@ module = {
 module = {
   name = multiboot;
   common = loader/multiboot.c;
-  common = lib/cmdline.c;
   x86 = loader/i386/multiboot_mbi.c;
   extra_dist = loader/multiboot_elfxx.c;
   enable = x86;
@@ -1669,16 +1611,13 @@ module = {
 module = {
   name = linux;
   x86 = loader/i386/linux.c;
-  xen = loader/i386/xen.c;
-  xen_cppflags	   = '$(CPPFLAGS_XEN)';
   i386_pc = lib/i386/pc/vesa_modes_table.c;
   mips = loader/mips/linux.c;
   powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
   sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
   ia64_efi = loader/ia64/efi/linux.c;
   arm = loader/arm/linux.c;
-  arm64 = loader/arm64/linux.c;
-  fdt = lib/fdt.c;
+  arm = lib/fdt.c;
   common = loader/linux.c;
   common = lib/cmdline.c;
   enable = noemu;
@@ -1688,19 +1627,14 @@ module = {
   name = xnu;
   x86 = loader/xnu_resume.c;
   x86 = loader/i386/xnu.c;
+  x86 = loader/macho32.c;
+  x86 = loader/macho64.c;
+  x86 = loader/macho.c;
   x86 = loader/xnu.c;
+  x86 = loader/lzss.c;
 
-  enable = x86;
-};
-
-module = {
-  name = macho;
-
-  common = loader/macho.c;
-  common = loader/macho32.c;
-  common = loader/macho64.c;
-  common = loader/lzss.c;
   extra_dist = loader/machoXX.c;
+  enable = x86;
 };
 
 module = {
@@ -1715,7 +1649,6 @@ module = {
   efi = loader/efi/chainloader.c;
   i386_pc = loader/i386/pc/chainloader.c;
   i386_coreboot = loader/i386/coreboot/chainloader.c;
-  i386_coreboot = lib/LzmaDec.c;
   enable = i386_pc;
   enable = i386_coreboot;
   enable = efi;
@@ -1737,7 +1670,6 @@ module = {
   enable = x86;
   enable = ia64_efi;
   enable = arm_efi;
-  enable = arm64_efi;
   enable = mips;
 };
 
@@ -1759,7 +1691,6 @@ module = {
   common = normal/term.c;
   common = normal/context.c;
   common = normal/charset.c;
-  common = lib/getline.c;
 
   common = script/main.c;
   common = script/script.c;
@@ -1943,37 +1874,6 @@ module = {
   common = tests/setjmp_test.c;
 };
 
-module = {
-  name = signature_test;
-  common = tests/signature_test.c;
-  common = tests/signatures.h;
-};
-
-module = {
-  name = sleep_test;
-  common = tests/sleep_test.c;
-};
-
-module = {
-  name = xnu_uuid_test;
-  common = tests/xnu_uuid_test.c;
-};
-
-module = {
-  name = pbkdf2_test;
-  common = tests/pbkdf2_test.c;
-};
-
-module = {
-  name = legacy_password_test;
-  common = tests/legacy_password_test.c;
-  enable = i386_pc;
-  enable = i386_efi;
-  enable = x86_64_efi;
-  enable = emu;
-  enable = xen;
-};
-
 module = {
   name = div_test;
   common = tests/div_test.c;
@@ -2132,19 +2032,11 @@ module = {
   emu = lib/i386/pc/vesa_modes_table.c;
   i386_efi = lib/i386/pc/vesa_modes_table.c;
   x86_64_efi = lib/i386/pc/vesa_modes_table.c;
-  xen = lib/i386/pc/vesa_modes_table.c;
 
   enable = i386_pc;
   enable = i386_efi;
   enable = x86_64_efi;
   enable = emu;
-  enable = xen;
-};
-
-module = {
-  name = syslinuxcfg;
-  common = lib/syslinux_parse.c;
-  common = commands/syslinuxcfg.c;
 };
 
 module = {
@@ -2178,12 +2070,8 @@ module = {
 module = {
   name = backtrace;
   x86 = lib/i386/backtrace.c;
-  i386_xen = lib/i386/backtrace.c;
-  x86_64_xen = lib/i386/backtrace.c;
   common = lib/backtrace.c;
   enable = x86;
-  enable = i386_xen;
-  enable = x86_64_xen;
 };
 
 module = {
@@ -2289,15 +2177,3 @@ module = {
   name = progress;
   common = lib/progress.c;
 };
-
-module = {
-  name = file;
-  common = commands/file.c;
-  common = commands/file32.c;
-  common = commands/file64.c;
-  extra_dist = commands/fileXX.c;
-  common = loader/i386/xen_file.c;
-  common = loader/i386/xen_file32.c;
-  common = loader/i386/xen_file64.c;
-  extra_dist = loader/i386/xen_fileXX.c;
-};

grub-core/boot/i386/pc/boot.S

@@ -31,32 +31,27 @@
 	.macro floppy
 part_start:
 
-LOCAL(probe_values):
+probe_values:
 	.byte	36, 18, 15, 9, 0
 
 LOCAL(floppy_probe):
-	pushw	%dx
 /*
  *  Perform floppy probe.
  */
-#ifdef __APPLE__
-	LOCAL(probe_values_minus_one) = LOCAL(probe_values) - 1
-	movw	MACRO_DOLLAR(LOCAL(probe_values_minus_one)), %si
-#else
-	movw	MACRO_DOLLAR(LOCAL(probe_values)) - 1, %si
-#endif
+
+	movw	$probe_values - 1, %si
 
 LOCAL(probe_loop):
 	/* reset floppy controller INT 13h AH=0 */
 	xorw	%ax, %ax
-	int	MACRO_DOLLAR(0x13)
+	int	$0x13
 
 	incw	%si
 	movb	(%si), %cl
 
 	/* if number of sectors is 0, display error and die */
-	testb	%cl, %cl
-	jnz	1f
+	cmpb	$0, %cl
+	jne	1f
 
 /*
  * Floppy disk probe failure.
@@ -69,20 +64,20 @@ fd_probe_error_string:	.asciz "Floppy"
 
 1:
 	/* perform read */
-	movw	MACRO_DOLLAR(GRUB_BOOT_MACHINE_BUFFER_SEG), %bx
+	movw	$GRUB_BOOT_MACHINE_BUFFER_SEG, %bx
 	movw	%bx, %es
 	xorw	%bx, %bx
-	movw	MACRO_DOLLAR(0x201), %ax
-	movb	MACRO_DOLLAR(0), %ch
-	movb	MACRO_DOLLAR(0), %dh
-	int	MACRO_DOLLAR(0x13)
+	movw	$0x201, %ax
+	movb	$0, %ch
+	movb	$0, %dh
+	int	$0x13
 
 	/* if error, jump to "LOCAL(probe_loop)" */
 	jc	LOCAL(probe_loop)
 
 	/* %cl is already the correct value! */
-	movb	MACRO_DOLLAR(1), %dh
-	movb	MACRO_DOLLAR(79), %ch
+	movb	$1, %dh
+	movb	$79, %ch
 
 	jmp	LOCAL(final_init)
 	.endm
@@ -165,8 +160,8 @@ start:
 	 * this area.
 	 */
 
-	.org GRUB_BOOT_MACHINE_BPB_START
-	.org 4
+	. = _start + GRUB_BOOT_MACHINE_BPB_START
+	. = _start + 4
 #endif
 #ifdef HYBRID_BOOT
 	floppy
@@ -174,7 +169,7 @@ start:
 	scratch
 #endif
 
-	.org GRUB_BOOT_MACHINE_BPB_END
+	. = _start + GRUB_BOOT_MACHINE_BPB_END
 	/*
 	 * End of BIOS parameter block.
 	 */
@@ -183,14 +178,12 @@ kernel_address:
 	.word	GRUB_BOOT_MACHINE_KERNEL_ADDR
 
 #ifndef HYBRID_BOOT
-	.org GRUB_BOOT_MACHINE_KERNEL_SECTOR
+	. = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
 kernel_sector:
-	.long	1
-kernel_sector_high:
-	.long	0
+	.long	1, 0
 #endif
 
-	.org GRUB_BOOT_MACHINE_BOOT_DRIVE
+	. = _start + GRUB_BOOT_MACHINE_BOOT_DRIVE
 boot_drive:
 	.byte 0xff	/* the disk to load kernel from */
 			/* 0xff means use the boot drive */
@@ -208,7 +201,7 @@ LOCAL(after_BPB):
          * possible boot drive. If GRUB is installed into a floppy,
          * this does nothing (only jump).
          */
-	.org GRUB_BOOT_MACHINE_DRIVE_CHECK
+	. = _start + GRUB_BOOT_MACHINE_DRIVE_CHECK
 boot_drive_check:
         jmp     3f	/* grub-setup may overwrite this jump */
         testb   $0x80, %dl
@@ -292,7 +285,7 @@ lba_mode:
 	/* the absolute address */
 	movl	kernel_sector, %ebx
 	movl	%ebx, 8(%si)
-	movl	kernel_sector_high, %ebx
+	movl	kernel_sector + 4, %ebx
 	movl	%ebx, 12(%si)
 
 	/* the segment of buffer address */
@@ -325,12 +318,11 @@ LOCAL(chs_mode):
 	int	$0x13
 	jnc	LOCAL(final_init)
 
-	popw	%dx
 	/*
 	 *  The call failed, so maybe use the floppy probe instead.
 	 */
-	testb	%dl, %dl
-	jnb	LOCAL(floppy_probe)
+	testb	$GRUB_BOOT_MACHINE_BIOS_HD_FLAG, %dl
+	jz	LOCAL(floppy_probe)
 
 	/* Nope, we definitely have a hard disk, and we're screwed. */
 	ERR(hd_probe_error_string)
@@ -361,7 +353,7 @@ LOCAL(final_init):
 
 setup_sectors:
 	/* load logical sector start (top half) */
-	movl	kernel_sector_high, %eax
+	movl	kernel_sector + 4, %eax
 
 	orl	%eax, %eax
 	jnz	LOCAL(geometry_error)
@@ -511,13 +503,11 @@ LOCAL(message):
 	 */
 
 #ifdef HYBRID_BOOT
-	.org 0x1b0
+	. = _start + 0x1b0
 kernel_sector:
-	.long	1
-kernel_sector_high:
-	.long	0
+	.long	1, 0
 #endif
-	.org GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
+	. = _start + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
 nt_magic:
 	.long 0
 	.word 0
@@ -528,7 +518,7 @@ nt_magic:
 	 *  sneaky, huh?
 	*/
 
-	.org GRUB_BOOT_MACHINE_PART_START
+	. = _start + GRUB_BOOT_MACHINE_PART_START
 
 #ifndef HYBRID_BOOT
 	floppy
@@ -536,7 +526,7 @@ nt_magic:
 	scratch
 #endif
 
-	.org GRUB_BOOT_MACHINE_PART_END
+	. = _start + GRUB_BOOT_MACHINE_PART_END
 	
 /* the last 2 bytes in the sector 0 contain the signature */
 	.word	GRUB_BOOT_MACHINE_SIGNATURE

grub-core/boot/i386/pc/cdboot.S

@@ -43,7 +43,7 @@ _start:
 LOCAL(next):
 	jmp	1f
 
-	.org 8
+	. = start + 8
 
 bi_pvd:
 	.long 0		/* LBA of primary volume descriptor.  */
@@ -168,6 +168,6 @@ err_noboot_msg:
 err_cdfail_msg:
 	.ascii	"cdrom read fails\0"
 
-	.org 0x7FF
+	. = start + 0x7FF
 
 	.byte	0

grub-core/boot/i386/pc/diskboot.S

@@ -362,7 +362,7 @@ LOCAL(message):
 	.word 0
 	.word 0
 
-	.org 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
+	. = _start + 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
 LOCAL(firstlist):	/* this label has to be before the first list entry!!! */
         /* fill the first data listing with the default */
 blocklist_default_start:

grub-core/boot/i386/pc/lnxboot.S

@@ -41,7 +41,7 @@ data_start:
 	xorl	%ebp, %ebp
 	jmp	LOCAL(linux_next)
 
-	.org	0x1F1
+	. = data_start + 0x1F1
 
 setup_sects:
 	.byte	CODE_SECTORS
@@ -292,4 +292,4 @@ LOCAL(fail):
 err_int15_msg:
 	.ascii	"move memory fails\0"
 
-	.org (CODE_SECTORS + 1) * 512
+	. = _start + CODE_SECTORS * 512

grub-core/boot/i386/pc/pxeboot.S

@@ -38,5 +38,5 @@ start:
 	/* This region is a junk. Do you say that this is wasteful?
 	   But I like that the memory layout of the body is consistent
 	   among different kernels rather than scamping just for 1.5KB. */
-	.org 0x8200 - 0x7C00 - 0x200 - 1
+	. = _start + 0x8200 - 0x7C00 - 0x200 - 1
 	.byte	0

grub-core/boot/i386/pc/startup_raw.S

@@ -50,23 +50,23 @@ LOCAL (base):
 	 *  This is a special data area.
 	 */
 
-	.org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
 LOCAL(compressed_size):
 	.long 0
-	.org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
 LOCAL(uncompressed_size):
 	.long 0
 
-	.org GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY
+	. = _start + GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY
 reed_solomon_redundancy:
 	.long	0
-	.org GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH
+	. = _start + GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH
 	.short	(LOCAL(reed_solomon_part) - _start)
 
 /*
  *  This is the area for all of the special variables.
  */
-	.org GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE
+	. = _start + GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE
 LOCAL(boot_dev):
 	.byte	0xFF, 0xFF, 0xFF
 LOCAL(boot_drive):
@@ -89,13 +89,13 @@ LOCAL (codestart):
 	sti		/* we're safe again */
 
 	/* save the boot drive */
-	movb	%dl, LOCAL(boot_drive)
+	ADDR32	movb	%dl, LOCAL(boot_drive)
 
 	/* reset disk system (%ah = 0) */
 	int	$0x13
 
 	/* transition to protected mode */
-	calll	real_to_prot
+	DATA32	call real_to_prot
 
 	/* The ".code32" directive takes GAS out of 16-bit mode. */
 	.code32
@@ -149,7 +149,7 @@ gate_a20_try_bios:
 	movw	$0x2401, %ax
 	int	$0x15
 
-	calll	real_to_prot
+	DATA32	call	real_to_prot
 	.code32
 
 	popl	%ebp

grub-core/boot/i386/qemu/boot.S

@@ -18,6 +18,7 @@
 
 #include <config.h>
 #include <grub/symbol.h>
+#include <grub/i386/pc/memory.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
@@ -31,7 +32,7 @@ _start:
 
 	jmp	1f
 
-	.org GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
+	. = _start + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
 VARIABLE(grub_core_entry_addr)
 	.long	0
 1:
@@ -48,7 +49,7 @@ VARIABLE(grub_core_entry_addr)
 	/* Transition to protected mode.  We use pushl to force generation
 	   of a flat return address.  */
 	pushl	$1f
-	jmpl	real_to_prot
+	DATA32	jmp real_to_prot
 	.code32
 	/* Ensure A20 is enabled. We're in qemu, so control port A works
 	   and there is no need to wait since there is no real logic, it's
@@ -58,7 +59,7 @@ VARIABLE(grub_core_entry_addr)
 	orb	$0x02, %al
 	outb	$0x92
 1:
-	movl	EXT_C(grub_core_entry_addr), %edx
+	movl	grub_core_entry_addr, %edx
 	jmp	*%edx
 
 #include "../../../kern/i386/realmode.S"
@@ -66,9 +67,9 @@ VARIABLE(grub_core_entry_addr)
 	/* Intel, in its infinite wisdom, decided to put the i8086 entry point
 	   *right here* and this is why we need this kludge.  */
 
-	.org GRUB_BOOT_MACHINE_SIZE - 16
+	. = GRUB_BOOT_MACHINE_SIZE - 16
 
        .code16
        
 	jmp	_start
-	.org GRUB_BOOT_MACHINE_SIZE
+	. = GRUB_BOOT_MACHINE_SIZE

grub-core/boot/mips/loongson/fwstart.S

@@ -63,18 +63,18 @@ __start:
 	   This way we don't need to sacrifice a register for it.  */
 retry_cs5536:	
 	/* We have only one bus (0). Function is 0.  */
-	lui $t0, %hi(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR_2F)
-	lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
+	lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE)
 	lui $t3, %hi(GRUB_CS5536_PCIID)
 	addiu $t3, $t3, %lo(GRUB_CS5536_PCIID)
 	ori $t4, $zero, 1
 1:
-	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES_2F) - 1)
+	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES) - 1)
 	/* In case of failure try again. CS5536 may be slow to come up.  */
 	beql  $t4, $zero, retry_cs5536
 	 nop
-	sw   $t4, %lo(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR_2F) ($t0)
-	lw   $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_PCI_REG_PCI_ID) ($t1)
+	sw   $t4, %lo(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR) ($t0)
+	lw   $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_PCI_REG_PCI_ID) ($t1)
 	bnel  $t2, $t3, 1b
 	 sll $t4, $t4, 1
 
@@ -86,9 +86,9 @@ retry_cs5536:
 	 move $a0, $t4
 #endif
 
-	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE)
 	li  $t1, GRUB_CS5536_MSR_MAILBOX_CONFIG_ENABLED
-	sw  $t1, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_CONFIG) ($t0)
+	sw  $t1, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_CONFIG) ($t0)
 	
 	/* Set GPIO LBAR.  */
 	lui $a0, %hi(GRUB_CS5536_MSR_GPIO_BAR)
@@ -121,21 +121,21 @@ retry_cs5536:
 	bal message
 	  addiu $a0, $a0, %lo(smbus_enabled)
 
-	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS)
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS)
 
 	/* Disable SMB.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
 
 	/* Disable interrupts.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1) ($t0)
 
 	/* Set as master.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_ADDR) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_ADDR) ($t0)
 
 	/* Launch SMBus controller at slowest speed possible.  */
 	ori $t1, $zero, 0xff
-	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL3) ($t0)
-	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
+	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL3) ($t0)
+	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
 
 	/* Yeeloong and Fuloong2f have only one memory slot.  */
 	/* Output first byte on serial for debugging.  */
@@ -162,7 +162,7 @@ retry_cs5536:
 
 	b continue
 
-	.org GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
+	. = start + GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
 tlb_refill:	
 	mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
 	mfc0 $s2, GRUB_CPU_LOONGSON_COP0_BADVADDR
@@ -196,13 +196,13 @@ tlb_refill:
 	b fatal
 	 addiu $a0, $a0, %lo(unhandled_tlb_refill)
 
-	.org GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
+	. = start + GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
 cache_error:
 	lui $a0, %hi(unhandled_cache_error)
 	b fatal
 	 addiu $a0, $a0, %lo(unhandled_cache_error)
 
-	.org GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
+	. = start + GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
 other_exception:
 	mfc0 $s0, GRUB_CPU_LOONGSON_COP0_CAUSE
 	mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
@@ -237,8 +237,8 @@ other_exception:
 	 addiu $a0, $a0, %lo(unhandled_exception)
 
 gpio_init:
-	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_GPIO)
-	addiu  $t0, $t0, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_GPIO)
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
+	addiu  $t0, $t0, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
 	lui $t1, %hi (gpio_dump)
 	addiu $t1, $t1, %lo (gpio_dump)
 
@@ -368,18 +368,18 @@ self:
            Clobbered:	 $t0
 	*/
 wrmsr:
-	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
-	sw  $a0, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_ADDR) ($t0)
-	sw  $a1, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_DATA0) ($t0)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE)
+	sw  $a0, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_ADDR) ($t0)
+	sw  $a1, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_DATA0) ($t0)
 	jr $ra
-	 sw  $a2, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_DATA1) ($t0)
+	 sw  $a2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_DATA1) ($t0)
 
 	/* Wait for SMBus data or empty transmitter.  */
 	/* In: $a0 = exception handler. Out: none. Clobbered: $t0, $t1  */
 smbus_wait:
 1:	
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	andi $t1, $t0, GRUB_CS5536_SMB_REG_STATUS_SDAST
 	bne $t1, $zero, return
 	 nop
@@ -401,52 +401,52 @@ read_spd:
 	addiu $a0, $a0, %hi(read_spd_fail)
 
 	/* Send START.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_START
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	
 	/* Send device address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	sll $t1, $a1, 1
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send ACK.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_ACK
-	sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send byte address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	bal smbus_wait
-	 sb $t2, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t2, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send START.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_START
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send device address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	sll $t1, $a1, 1
 	ori $t1, $t1, 1
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send STOP.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_STOP
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
-	lb $v0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
+	lb $v0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	jr $t3
 	 andi $v0, $v0, 0xff
 read_spd_fail:

grub-core/boot/mips/startup_raw.S

@@ -27,7 +27,6 @@
 
 .extern __bss_start
 .extern _end
-.extern _edata
 
 	.globl __start, _start, start
 	.set noreorder
@@ -39,13 +38,13 @@ start:
 	bal codestart
 	 nop
 base:	
-	.org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
 compressed_size:
 	.long 0
-	.org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
 uncompressed_size:
 	.long 0
-	.org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
+	. = _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
 uncompressed_addr:
 	.long 0
 codestart:
@@ -249,9 +248,8 @@ cmdlinedone:
 #include "../../kern/mips/cache_flush.S"
 
 	/* Decompress the payload. */
-	lui $a0, %hi(_edata)
-	addiu $a0, $a0, %lo(_edata)
-
+	lui $a0, %hi(__bss_start)
+	addiu $a0, $a0, %lo(__bss_start)
 	lui $t0, %hi(base)
 	addiu $t0, $t0, %lo(base)
 	subu $a0, $a0, $t0
@@ -267,16 +265,16 @@ cmdlinedone:
 	*/
 	move $s6, $a3
 
-	lui $t9, %hi(EXT_C(grub_decompress_core))
-	addiu $t9, $t9, %lo(EXT_C(grub_decompress_core))
+	lui $t0, %hi(EXT_C(grub_decompress_core))
+	addiu $t0, $t0, %lo(EXT_C(grub_decompress_core))
 
 #ifdef GRUB_MACHINE_ARC
 	lui $sp, %hi(_start - 512)
-	jalr $t9
+	jalr $t0
 	 addiu $sp, $sp, %lo(_start - 512)
 #else
 	lui $sp, %hi(_start - 256)
-	jalr $t9
+	jalr $t0
 	 addiu $sp, $sp, %lo(_start - 256)
 #endif	
 	move $a0, $s1
@@ -289,11 +287,3 @@ cmdlinedone:
 
 	jr $t1
 	 nop
-	/* Ensure that .data section is created. In code we suppose that _edata
-	   is first location not in decompressor image. Strictly speaking it's
-	   _edata only when .data is present and _etext otherwise. But checking
-	   for .data presence would cost more in code than it is to ensure that
-	   .data is created.
-	*/
-	.data
-	.long 0

grub-core/boot/sparc64/ieee1275/boot.S

@@ -41,18 +41,18 @@ pic_base:
 	 * After loading in that block we will execute it by jumping to the
 	 * load address plus the size of the prepended A.OUT header (32 bytes).
 	 */
-	.org GRUB_BOOT_MACHINE_BOOT_DEVPATH
+	. = _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH
 boot_path:
-	.org GRUB_BOOT_MACHINE_KERNEL_BYTE
-boot_path_end:
+	. = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE
 kernel_byte:		.xword (2 << 9)
+boot_path_end:
 kernel_address:		.word  GRUB_BOOT_MACHINE_KERNEL_ADDR
 #else
-#define boot_path (_start + 512 + SCRATCH_PAD_BOOT_SIZE)
+#define boot_path (_start + 512)
 #define boot_path_end (_start + 1024)
 #include <grub/offsets.h>
 
-	.org 8
+	. = _start + 8
 kernel_byte:		.xword (2 << 9)
 kernel_size:	        .word  512
 kernel_address:		.word  GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS
@@ -140,11 +140,7 @@ prom_call:
 
 boot_continue:
 	mov	%o7, PIC_REG		/* PIC base */
-#ifndef CDBOOT
 	sethi	%hi(SCRATCH_PAD_BOOT), %l1	/* OF argument slots */
-#else
-	GET_ABS(_start + 512, %l1)	/* OF argument slots */
-#endif
 
 	/* Find the /chosen node so we can fetch the stdout handle,
 	 * and thus perform console output.
@@ -224,7 +220,7 @@ bootpath_known:
 #else
 	 nop
 #endif
-	.org GRUB_BOOT_MACHINE_CODE_END
+	. = _start + GRUB_BOOT_MACHINE_CODE_END
 
 /* the last 4 bytes in the sector 0 contain the signature */
 	.word	GRUB_BOOT_MACHINE_SIGNATURE

grub-core/boot/sparc64/ieee1275/diskboot.S

@@ -136,7 +136,7 @@ lastlist:
 	.word	0
 	.word	0
 
-	.org (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
+	. = _start + (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
 blocklist_default_start:
 	.word	0
 	.word	2

grub-core/bus/bonito.c

@@ -30,66 +30,8 @@ static grub_addr_t addr_win[GRUB_MACHINE_PCI_NUM_WIN] =
   {GRUB_MACHINE_PCI_WIN1_ADDR, GRUB_MACHINE_PCI_WIN2_ADDR,
    GRUB_MACHINE_PCI_WIN3_ADDR};
 
-grub_bonito_type_t grub_bonito_type;
-
-static volatile void *
-config_addr (grub_pci_address_t addr)
-{
-  if (grub_bonito_type == GRUB_BONITO_2F)
-    {
-      GRUB_MACHINE_PCI_CONF_CTRL_REG_2F = 1 << ((addr >> 11) & 0xf);
-      return (volatile void *) (GRUB_MACHINE_PCI_CONFSPACE_2F
-				| (addr & 0x07ff));
-    }
-  else
-    {
-
-      if (addr >> 16)
-	return (volatile void *) (GRUB_MACHINE_PCI_CONFSPACE_3A_EXT | addr);
-      else
-	return (volatile void *) (GRUB_MACHINE_PCI_CONFSPACE_3A | addr);
-    }
-}
-
-grub_uint32_t
-grub_pci_read (grub_pci_address_t addr)
-{
-  return *(volatile grub_uint32_t *) config_addr (addr);
-}
-
-grub_uint16_t
-grub_pci_read_word (grub_pci_address_t addr)
-{
-  return *(volatile grub_uint16_t *) config_addr (addr);
-}
-
-grub_uint8_t
-grub_pci_read_byte (grub_pci_address_t addr)
-{
-  return *(volatile grub_uint8_t *) config_addr (addr);
-}
-
-void
-grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
-{
-  *(volatile grub_uint32_t *) config_addr (addr) = data;
-}
-
-void
-grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
-{
-  *(volatile grub_uint16_t *) config_addr (addr) = data;
-}
-
-void
-grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
-{
-  *(volatile grub_uint8_t *) config_addr (addr) = data;
-}
-
-
 static inline void
-write_bases_2f (void)
+write_bases (void)
 {
   int i;
   grub_uint32_t reg = 0;
@@ -97,54 +39,38 @@ write_bases_2f (void)
     reg |= (((base_win[i] >> GRUB_MACHINE_PCI_WIN_SHIFT) 
 	     & GRUB_MACHINE_PCI_WIN_MASK) 
 	    << (i * GRUB_MACHINE_PCI_WIN_MASK_SIZE));
-  GRUB_MACHINE_PCI_IO_CTRL_REG_2F = reg;
+  GRUB_MACHINE_PCI_IO_CTRL_REG = reg;
 }
 
 volatile void *
 grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 			   grub_addr_t base, grub_size_t size)
 {
-  if (grub_bonito_type == GRUB_BONITO_2F)
-    {
-      int i;
-      grub_addr_t newbase;
+  int i;
+  grub_addr_t newbase;
 
-      /* First try already used registers. */
-      for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
-	if (usage_win[i] && base_win[i] <= base 
-	    && base_win[i] + sizes_win[i] > base + size)
-	  {
-	    usage_win[i]++;
-	    return (void *) 
-	      (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
-	  }
-      /* Map new register.  */
-      newbase = base & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK;
-      for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
-	if (!usage_win[i] && newbase <= base 
-	    && newbase + sizes_win[i] > base + size)
-	  {
-	    usage_win[i]++;
-	    base_win[i] = newbase;
-	    write_bases_2f ();
-	    return (void *) 
-	      (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
-	  }
-      grub_fatal ("Out of PCI windows.");
-    }
-  else
-    {
-      int region = 0;
-      if (base >= 0x10000000
-	  && base + size <= 0x18000000)
-	region = 1;
-      if (base >= 0x1c000000
-	  && base + size <= 0x1f000000)
-	region = 2;
-      if (region == 0)
-	grub_fatal ("Attempt to map out of regions");
-      return (void *) (0xa0000000 | base);
-    }
+  /* First try already used registers. */
+  for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
+    if (usage_win[i] && base_win[i] <= base 
+	&& base_win[i] + sizes_win[i] > base + size)
+      {
+	usage_win[i]++;
+	return (void *) 
+	  (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
+      }
+  /* Map new register.  */
+  newbase = base & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK;
+  for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
+    if (!usage_win[i] && newbase <= base 
+	&& newbase + sizes_win[i] > base + size)
+      {
+	usage_win[i]++;
+	base_win[i] = newbase;
+	write_bases ();
+	return (void *) 
+	  (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
+      }
+  grub_fatal ("Out of PCI windows.");
 }
 
 void *
@@ -160,17 +86,14 @@ grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
 			     volatile void *mem,
 			     grub_size_t size __attribute__ ((unused)))
 {
-  if (grub_bonito_type == GRUB_BONITO_2F)
-    {
-      int i;
-      for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
-	if (usage_win[i] && addr_win[i] 
-	    == (((grub_addr_t) mem | 0x20000000)
-		& ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK))
-	  {
-	    usage_win[i]--;
-	    return;
-	  }
-      grub_fatal ("Tried to unmap not mapped region");
-    }
+  int i;
+  for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
+    if (usage_win[i] && addr_win[i] 
+	== (((grub_addr_t) mem | 0x20000000)
+	    & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK))
+      {
+	usage_win[i]--;
+	return;
+      }
+  grub_fatal ("Tried to unmap not mapped region");
 }

grub-core/bus/i386/ieee1275/pci.c

@@ -1,42 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/pci.h>
-#include <grub/mm.h>
-#include <grub/misc.h>
-#include <grub/ieee1275/ieee1275.h>
-
-volatile void *
-grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
-			   grub_addr_t base,
-			   grub_size_t size)
-{
-  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_REAL_MODE))
-    return (volatile void *) base;
-  if (grub_ieee1275_map (base, base, size, 7))
-    grub_fatal ("couldn't map 0x%lx", base);
-  return (volatile void *) base;
-}
-
-void
-grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-			     volatile void *mem __attribute__ ((unused)),
-			     grub_size_t size __attribute__ ((unused)))
-{
-}

grub-core/bus/usb/ehci.c

@@ -534,20 +534,11 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
 			"EHCI grub_ehci_pci_iter: registers above 4G are not supported\n");
 	  return 0;
 	}
-      base &= GRUB_PCI_ADDR_MEM_MASK;
-      if (!base)
-	{
-	  grub_dprintf ("ehci",
-			"EHCI: EHCI is not mapped\n");
-	  return 0;
-	}
 
       /* Set bus master - needed for coreboot, VMware, broken BIOSes etc. */
       addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
       grub_pci_write_word(addr,
-			  GRUB_PCI_COMMAND_MEM_ENABLED
-			  | GRUB_PCI_COMMAND_BUS_MASTER
-			  | grub_pci_read_word(addr));
+          GRUB_PCI_COMMAND_BUS_MASTER | grub_pci_read_word(addr));
       
       grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n");
     }
@@ -1513,7 +1504,7 @@ grub_ehci_check_transfer (grub_usb_controller_t dev,
   struct grub_ehci *e = dev->data;
   struct grub_ehci_transfer_controller_data *cdata =
     transfer->controller_data;
-  grub_uint32_t token, token_ftd;
+  grub_uint32_t token;
 
   grub_dprintf ("ehci",
 		"check_transfer: EHCI STATUS=%08x, cdata=%p, qh=%p\n",
@@ -1541,18 +1532,13 @@ grub_ehci_check_transfer (grub_usb_controller_t dev,
     return grub_ehci_parse_notrun (dev, transfer, actual);
 
   token = grub_le_to_cpu32 (cdata->qh_virt->td_overlay.token);
-  /* If the transfer consist from only one TD, we should check */
-  /* if the TD was really executed and deactivated - to prevent */
-  /* false detection of transfer finish. */
-  token_ftd = grub_le_to_cpu32 (cdata->td_first_virt->token);
 
   /* Detect QH halted */
   if ((token & GRUB_EHCI_STATUS_HALTED) != 0)
     return grub_ehci_parse_halt (dev, transfer, actual);
 
   /* Detect QH not active - QH is not active and no next TD */
-  if (token && ((token & GRUB_EHCI_STATUS_ACTIVE) == 0)
-	&& ((token_ftd & GRUB_EHCI_STATUS_ACTIVE) == 0))
+  if ((token & GRUB_EHCI_STATUS_ACTIVE) == 0)
     {
       /* It could be finish at all or short packet condition */
       if ((grub_le_to_cpu32 (cdata->qh_virt->td_overlay.next_td)

grub-core/bus/usb/ohci.c

@@ -47,7 +47,7 @@ struct grub_ohci_hcca
   grub_uint32_t donehead;
 
   grub_uint8_t reserved[116];
-} GRUB_PACKED;
+} __attribute__((packed));
 
 /* OHCI General Transfer Descriptor */
 struct grub_ohci_td
@@ -64,7 +64,7 @@ struct grub_ohci_td
                                * physical address in CPU endian */
   grub_uint32_t tr_index; /* index of TD in transfer */
   grub_uint8_t pad[8 - sizeof (volatile struct grub_ohci_td *)]; /* padding to 32 bytes */
-} GRUB_PACKED;
+} __attribute__((packed));
 
 /* OHCI Endpoint Descriptor.  */
 struct grub_ohci_ed
@@ -73,7 +73,7 @@ struct grub_ohci_ed
   grub_uint32_t td_tail;
   grub_uint32_t td_head;
   grub_uint32_t next_ed;
-} GRUB_PACKED;
+} __attribute__((packed));
 
 typedef volatile struct grub_ohci_td *grub_ohci_td_t;
 typedef volatile struct grub_ohci_ed *grub_ohci_ed_t;
@@ -265,20 +265,16 @@ grub_ohci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
       addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
       base = grub_pci_read (addr);
 
-      base &= GRUB_PCI_ADDR_MEM_MASK;
-      if (!base)
-	{
-	  grub_dprintf ("ehci",
-			"EHCI: EHCI is not mapper\n");
-	  return 0;
-	}
+#if 0
+      /* Stop if there is no IO space base address defined.  */
+      if (! (base & 1))
+	return 0;
+#endif
 
       /* Set bus master - needed for coreboot, VMware, broken BIOSes etc. */
       addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
       grub_pci_write_word(addr,
-			  GRUB_PCI_COMMAND_MEM_ENABLED
-			  | GRUB_PCI_COMMAND_BUS_MASTER
-			  | grub_pci_read_word(addr));
+          GRUB_PCI_COMMAND_BUS_MASTER | grub_pci_read_word(addr));
 
       grub_dprintf ("ohci", "class=0x%02x 0x%02x interface 0x%02x\n",
 		    class, subclass, interf);

grub-core/bus/usb/serial/pl2303.c

@@ -55,7 +55,7 @@ struct grub_pl2303_config
   grub_uint8_t stop_bits;
   grub_uint8_t parity;
   grub_uint8_t word_len;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static void
 real_config (struct grub_serial_port *port)

grub-core/bus/usb/uhci.c

@@ -105,7 +105,7 @@ struct grub_uhci_qh
   /* Queue heads are aligned on 16 bytes, pad so a queue head is 16
      bytes so we can store many in a 4K page.  */
   grub_uint8_t pad[8];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* UHCI Transfer Descriptor.  */
 struct grub_uhci_td
@@ -129,7 +129,7 @@ struct grub_uhci_td
 
   /* 3 additional 32 bits words reserved for the Host Controller Driver.  */
   grub_uint32_t data[3];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 typedef volatile struct grub_uhci_td *grub_uhci_td_t;
 typedef volatile struct grub_uhci_qh *grub_uhci_qh_t;
@@ -217,6 +217,12 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
   if (class != 0x0c || subclass != 0x03 || interf != 0x00)
     return 0;
 
+  /* Set bus master - needed for coreboot or broken BIOSes */
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
+  grub_pci_write_word(addr, GRUB_PCI_COMMAND_IO_ENABLED
+		      | GRUB_PCI_COMMAND_BUS_MASTER
+		      | grub_pci_read_word (addr));
+
   /* Determine IO base address.  */
   addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG4);
   base = grub_pci_read (addr);
@@ -227,13 +233,6 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
   if ((base & GRUB_UHCI_IOMASK) == 0)
     return 0;
 
-  /* Set bus master - needed for coreboot or broken BIOSes */
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-  grub_pci_write_word(addr, GRUB_PCI_COMMAND_IO_ENABLED
-		      | GRUB_PCI_COMMAND_BUS_MASTER
-		      | GRUB_PCI_COMMAND_MEM_ENABLED
-		      | grub_pci_read_word (addr));
-
   grub_dprintf ("uhci", "base = %x\n", base);
 
   /* Allocate memory for the controller and register it.  */

grub-core/commands/acpi.c

@@ -227,7 +227,7 @@ grub_acpi_create_ebda (void)
 	    grub_dprintf ("acpi", "Copying rsdpv2 to %p\n", target);
 	    v2inebda = target;
 	    target += v2->length;
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);
 	    v2 = 0;
 	    break;
 	  }
@@ -246,7 +246,7 @@ grub_acpi_create_ebda (void)
 	    grub_dprintf ("acpi", "Copying rsdpv1 to %p\n", target);
 	    v1inebda = target;
 	    target += sizeof (struct grub_acpi_rsdp_v10);
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);
 	    v1 = 0;
 	    break;
 	  }
@@ -265,7 +265,7 @@ grub_acpi_create_ebda (void)
 	    grub_memcpy (target, v2, v2->length);
 	    v2inebda = target;
 	    target += v2->length;
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);
 	    v2 = 0;
 	    break;
 	  }
@@ -282,7 +282,7 @@ grub_acpi_create_ebda (void)
 	    grub_memcpy (target, v1, sizeof (struct grub_acpi_rsdp_v10));
 	    v1inebda = target;
 	    target += sizeof (struct grub_acpi_rsdp_v10);
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);
 	    v1 = 0;
 	    break;
 	  }
@@ -306,7 +306,7 @@ grub_acpi_create_ebda (void)
       *target = 0;
 
   grub_dprintf ("acpi", "Switching EBDA\n");
-  (*((grub_uint16_t *) 0x40e)) = ((grub_addr_t) targetebda) >> 4;
+  (*((grub_uint16_t *) 0x40e)) = ((long)targetebda) >> 4;
   grub_dprintf ("acpi", "EBDA switched\n");
 
   return GRUB_ERR_NONE;

grub-core/commands/boot.c

@@ -146,7 +146,8 @@ grub_loader_boot (void)
     return grub_error (GRUB_ERR_NO_KERNEL,
 		       N_("you need to load the kernel first"));
 
-  grub_machine_fini (grub_loader_flags);
+  if (grub_loader_flags & GRUB_LOADER_FLAG_NORETURN)
+    grub_machine_fini ();
 
   for (cur = preboots_head; cur; cur = cur->next)
     {

grub-core/commands/boottime.c

@@ -56,7 +56,7 @@ GRUB_MOD_INIT(boottime)
 {
   cmd_boottime =
     grub_register_command ("boottime", grub_cmd_boottime,
-			   0, N_("Show boot time statistics."));
+			   0, N_("Get boot time statistics."));
 }
 
 GRUB_MOD_FINI(boottime)

grub-core/commands/efi/acpi.c

@@ -26,14 +26,14 @@ struct grub_acpi_rsdp_v10 *
 grub_machine_acpi_get_rsdpv1 (void)
 {
   unsigned i;
-  static grub_efi_packed_guid_t acpi_guid = GRUB_EFI_ACPI_TABLE_GUID;
+  static grub_efi_guid_t acpi_guid = GRUB_EFI_ACPI_TABLE_GUID;
 
   for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
     {
-      grub_efi_packed_guid_t *guid =
+      grub_efi_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
 
-      if (! grub_memcmp (guid, &acpi_guid, sizeof (grub_efi_packed_guid_t)))
+      if (! grub_memcmp (guid, &acpi_guid, sizeof (grub_efi_guid_t)))
 	return (struct grub_acpi_rsdp_v10 *)
 	  grub_efi_system_table->configuration_table[i].vendor_table;
     }
@@ -44,14 +44,14 @@ struct grub_acpi_rsdp_v20 *
 grub_machine_acpi_get_rsdpv2 (void)
 {
   unsigned i;
-  static grub_efi_packed_guid_t acpi20_guid = GRUB_EFI_ACPI_20_TABLE_GUID;
+  static grub_efi_guid_t acpi20_guid = GRUB_EFI_ACPI_20_TABLE_GUID;
 
   for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
     {
-      grub_efi_packed_guid_t *guid =
+      grub_efi_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
 
-      if (! grub_memcmp (guid, &acpi20_guid, sizeof (grub_efi_packed_guid_t)))
+      if (! grub_memcmp (guid, &acpi20_guid, sizeof (grub_efi_guid_t)))
 	return (struct grub_acpi_rsdp_v20 *)
 	  grub_efi_system_table->configuration_table[i].vendor_table;
     }

grub-core/commands/efi/loadbios.c

@@ -105,7 +105,7 @@ fake_bios_data (int use_rom)
   smbios = 0;
   for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
     {
-      grub_efi_packed_guid_t *guid =
+      grub_efi_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
 
       if (! grub_memcmp (guid, &acpi2_guid, sizeof (grub_efi_guid_t)))

grub-core/commands/efi/lsefi.c

@@ -95,7 +95,7 @@ grub_cmd_lsefi (grub_command_t cmd __attribute__ ((unused)),
       grub_efi_handle_t handle = handles[i];
       grub_efi_status_t status;
       grub_efi_uintn_t num_protocols;
-      grub_efi_packed_guid_t **protocols;
+      grub_efi_guid_t **protocols;
       grub_efi_device_path_t *dp;
 
       grub_printf ("Handle %p\n", handle);

grub-core/commands/efi/lsefisystab.c

@@ -71,7 +71,7 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
 
   grub_printf (", Version=%x\n", st->firmware_revision);
 
-  grub_printf ("%lld tables:\n", (long long) st->num_table_entries);
+  grub_printf ("%ld tables:\n", st->num_table_entries);
   t = st->configuration_table;
   for (i = 0; i < st->num_table_entries; i++)
     {

grub-core/commands/efi/lssal.c

@@ -32,7 +32,7 @@ disp_sal (void *table)
 {
   struct grub_efi_sal_system_table *t = table;
   void *desc;
-  grub_uint32_t len, l, i;
+  grub_uint32_t len, l;
 
   grub_printf ("SAL rev: %02x, signature: %x, len:%x\n",
 	       t->sal_rev, t->signature, t->total_table_len);
@@ -44,9 +44,7 @@ disp_sal (void *table)
 
   desc = t->entries;
   len = t->total_table_len - sizeof (struct grub_efi_sal_system_table);
-  if (t->total_table_len <= sizeof (struct grub_efi_sal_system_table))
-    return;
-  for (i = 0; i < t->entry_count; i++)
+  while (len > 0)
     {
       switch (*(grub_uint8_t *) desc)
 	{
@@ -125,8 +123,6 @@ disp_sal (void *table)
 	  return;
 	}
       desc = (grub_uint8_t *)desc + l;
-      if (len <= l)
-	return;
       len -= l;
     }
 }
@@ -139,12 +135,12 @@ grub_cmd_lssal (struct grub_command *cmd __attribute__ ((unused)),
   const grub_efi_system_table_t *st = grub_efi_system_table;
   grub_efi_configuration_table_t *t = st->configuration_table;
   unsigned int i;
-  grub_efi_packed_guid_t guid = GRUB_EFI_SAL_TABLE_GUID;
+  grub_efi_guid_t guid = GRUB_EFI_SAL_TABLE_GUID;
 
   for (i = 0; i < st->num_table_entries; i++)
     {
       if (grub_memcmp (&guid, &t->vendor_guid,
-		       sizeof (grub_efi_packed_guid_t)) == 0)
+		       sizeof (grub_efi_guid_t)) == 0)
 	{
 	  disp_sal (t->vendor_table);
 	  return GRUB_ERR_NONE;

grub-core/commands/file.c

@@ -1,678 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/env.h>
-#include <grub/command.h>
-#include <grub/extcmd.h>
-#include <grub/i18n.h>
-#include <grub/file.h>
-#include <grub/elf.h>
-#include <grub/xen_file.h>
-#include <grub/efi/pe32.h>
-#include <grub/i386/linux.h>
-#include <grub/xnu.h>
-#include <grub/machoload.h>
-#include <grub/fileid.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-static const struct grub_arg_option options[] = {
-  {"is-i386-xen-pae-domu", 0, 0,
-   N_("Check if FILE can be booted as i386 PAE Xen unprivileged guest kernel"),
-   0, 0},
-  {"is-x86_64-xen-domu", 0, 0,
-   N_("Check if FILE can be booted as x86_64 Xen unprivileged guest kernel"), 0, 0},
-  {"is-x86-xen-dom0", 0, 0,
-   N_("Check if FILE can be used as Xen x86 privileged guest kernel"), 0, 0},
-  {"is-x86-multiboot", 0, 0,
-   N_("Check if FILE can be used as x86 multiboot kernel"), 0, 0},
-  {"is-x86-multiboot2", 0, 0,
-   N_("Check if FILE can be used as x86 multiboot2 kernel"), 0, 0},
-  {"is-arm-linux", 0, 0,
-   N_("Check if FILE is ARM Linux"), 0, 0},
-  {"is-arm64-linux", 0, 0,
-   N_("Check if FILE is ARM64 Linux"), 0, 0},
-  {"is-ia64-linux", 0, 0,
-   N_("Check if FILE is IA64 Linux"), 0, 0},
-  {"is-mips-linux", 0, 0,
-   N_("Check if FILE is MIPS Linux"), 0, 0},
-  {"is-mipsel-linux", 0, 0,
-   N_("Check if FILE is MIPSEL Linux"), 0, 0},
-  {"is-sparc64-linux", 0, 0,
-   N_("Check if FILE is SPARC64 Linux"), 0, 0},
-  {"is-powerpc-linux", 0, 0,
-   N_("Check if FILE is POWERPC Linux"), 0, 0},
-  {"is-x86-linux", 0, 0,
-   N_("Check if FILE is x86 Linux"), 0, 0},
-  {"is-x86-linux32", 0, 0,
-   N_("Check if FILE is x86 Linux supporting 32-bit protocol"), 0, 0},
-  {"is-x86-kfreebsd", 0, 0,
-   N_("Check if FILE is x86 kFreeBSD"), 0, 0},
-  {"is-i386-kfreebsd", 0, 0,
-   N_("Check if FILE is i386 kFreeBSD"), 0, 0},
-  {"is-x86_64-kfreebsd", 0, 0,
-   N_("Check if FILE is x86_64 kFreeBSD"), 0, 0},
-
-  {"is-x86-knetbsd", 0, 0,
-   N_("Check if FILE is x86 kNetBSD"), 0, 0},
-  {"is-i386-knetbsd", 0, 0,
-   N_("Check if FILE is i386 kNetBSD"), 0, 0},
-  {"is-x86_64-knetbsd", 0, 0,
-   N_("Check if FILE is x86_64 kNetBSD"), 0, 0},
-
-  {"is-i386-efi", 0, 0,
-   N_("Check if FILE is i386 EFI file"), 0, 0},
-  {"is-x86_64-efi", 0, 0,
-   N_("Check if FILE is x86_64 EFI file"), 0, 0},
-  {"is-ia64-efi", 0, 0,
-   N_("Check if FILE is IA64 EFI file"), 0, 0},
-  {"is-arm64-efi", 0, 0,
-   N_("Check if FILE is ARM64 EFI file"), 0, 0},
-  {"is-arm-efi", 0, 0,
-   N_("Check if FILE is ARM EFI file"), 0, 0},
-  {"is-hibernated-hiberfil", 0, 0,
-   N_("Check if FILE is hiberfil.sys in hibernated state"), 0, 0},
-  {"is-x86_64-xnu", 0, 0,
-   N_("Check if FILE is x86_64 XNU (Mac OS X kernel)"), 0, 0},
-  {"is-i386-xnu", 0, 0,
-   N_("Check if FILE is i386 XNU (Mac OS X kernel)"), 0, 0},
-  {"is-xnu-hibr", 0, 0,
-   N_("Check if FILE is XNU (Mac OS X kernel) hibernated image"), 0, 0},
-  {"is-x86-bios-bootsector", 0, 0,
-   N_("Check if FILE is BIOS bootsector"), 0, 0},
-  {0, 0, 0, 0, 0, 0}
-};
-
-enum
-{
-  IS_PAE_DOMU,
-  IS_64_DOMU,
-  IS_DOM0,
-  IS_MULTIBOOT,
-  IS_MULTIBOOT2,
-  IS_ARM_LINUX,
-  IS_ARM64_LINUX,
-  IS_IA64_LINUX,
-  IS_MIPS_LINUX,
-  IS_MIPSEL_LINUX,
-  IS_SPARC64_LINUX,
-  IS_POWERPC_LINUX,
-  IS_X86_LINUX,
-  IS_X86_LINUX32,
-  IS_X86_KFREEBSD,
-  IS_X86_KFREEBSD32,
-  IS_X86_KFREEBSD64,
-  IS_X86_KNETBSD,
-  IS_X86_KNETBSD32,
-  IS_X86_KNETBSD64,
-  IS_32_EFI,
-  IS_64_EFI,
-  IS_IA_EFI,
-  IS_ARM64_EFI,
-  IS_ARM_EFI,
-  IS_HIBERNATED,
-  IS_XNU64,
-  IS_XNU32,
-  IS_XNU_HIBR,
-  IS_BIOS_BOOTSECTOR,
-  OPT_TYPE_MIN = IS_PAE_DOMU,
-  OPT_TYPE_MAX = IS_BIOS_BOOTSECTOR
-};
-
-
-static grub_err_t
-grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
-{
-  grub_file_t file = 0;
-  grub_elf_t elf = 0;
-  grub_err_t err;
-  int type = -1, i;
-  int ret = 0;
-  grub_macho_t macho = 0;
-
-  if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-  for (i = OPT_TYPE_MIN; i <= OPT_TYPE_MAX; i++)
-    if (ctxt->state[i].set)
-      {
-	if (type == -1)
-	  {
-	    type = i;
-	    continue;
-	  }
-	return grub_error (GRUB_ERR_BAD_ARGUMENT, "multiple types specified");
-      }
-  if (type == -1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no type specified");
-
-  file = grub_file_open (args[0]);
-  if (!file)
-    return grub_errno;
-  switch (type)
-    {
-    case IS_BIOS_BOOTSECTOR:
-      {
-	grub_uint16_t sig;
-	if (grub_file_size (file) != 512)
-	  break;
-	if (grub_file_seek (file, 510) == (grub_size_t) -1)
-	  break;
-	if (grub_file_read (file, &sig, 2) != 2)
-	  break;
-	if (sig != grub_cpu_to_le16_compile_time (0xaa55))
-	  break;
-	ret = 1;
-	break;
-      }
-    case IS_IA64_LINUX:
-      {
-	Elf64_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_ident[EI_CLASS] != ELFCLASS64
-	    || ehdr.e_ident[EI_DATA] != ELFDATA2LSB
-	    || ehdr.e_machine != grub_cpu_to_le16_compile_time (EM_IA_64))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-
-    case IS_SPARC64_LINUX:
-      {
-	Elf64_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_ident[EI_CLASS] != ELFCLASS64
-	    || ehdr.e_ident[EI_DATA] != ELFDATA2MSB)
-	  break;
-
-	if (ehdr.e_machine != grub_cpu_to_le16_compile_time (EM_SPARCV9)
-	    || ehdr.e_type != grub_cpu_to_be16_compile_time (ET_EXEC))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-
-    case IS_POWERPC_LINUX:
-      {
-	Elf32_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_ident[EI_DATA] != ELFDATA2MSB
-	    || (ehdr.e_machine != grub_cpu_to_le16_compile_time (EM_PPC)
-		&& ehdr.e_machine !=
-		grub_cpu_to_le16_compile_time (EM_PPC64)))
-	  break;
-
-	if (ehdr.e_type != grub_cpu_to_be16_compile_time (ET_EXEC)
-	    && ehdr.e_type != grub_cpu_to_be16_compile_time (ET_DYN))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-
-    case IS_MIPS_LINUX:
-      {
-	Elf32_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_ident[EI_DATA] != ELFDATA2MSB
-	    || ehdr.e_machine != grub_cpu_to_be16_compile_time (EM_MIPS)
-	    || ehdr.e_type != grub_cpu_to_be16_compile_time (ET_EXEC))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-
-    case IS_X86_KNETBSD:
-    case IS_X86_KNETBSD32:
-    case IS_X86_KNETBSD64:
-      {
-	int is32, is64;
-
-	elf = grub_elf_file (file, file->name);
-
-	if (elf->ehdr.ehdr32.e_type != grub_cpu_to_le16_compile_time (ET_EXEC)
-	    || elf->ehdr.ehdr32.e_ident[EI_DATA] != ELFDATA2LSB)
-	  break;
-
-	is32 = grub_elf_is_elf32 (elf);
-	is64 = grub_elf_is_elf64 (elf);
-	if (!is32 && !is64)
-	  break;
-	if (!is32 && type == IS_X86_KNETBSD32)
-	  break;
-	if (!is64 && type == IS_X86_KNETBSD64)
-	  break;
-	if (is64)
-	  ret = grub_file_check_netbsd64 (elf);
-	if (is32)
-	  ret = grub_file_check_netbsd32 (elf);
-	break;
-      }
-
-    case IS_X86_KFREEBSD:
-    case IS_X86_KFREEBSD32:
-    case IS_X86_KFREEBSD64:
-      {
-	Elf32_Ehdr ehdr;
-	int is32, is64;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_type != grub_cpu_to_le16_compile_time (ET_EXEC)
-	    || ehdr.e_ident[EI_DATA] != ELFDATA2LSB)
-	  break;
-
-	if (ehdr.e_ident[EI_OSABI] != ELFOSABI_FREEBSD)
-	  break;
-
-	is32 = (ehdr.e_machine == grub_cpu_to_le16_compile_time (EM_386)
-		&& ehdr.e_ident[EI_CLASS] == ELFCLASS32);
-	is64 = (ehdr.e_machine == grub_cpu_to_le16_compile_time (EM_X86_64)
-		&& ehdr.e_ident[EI_CLASS] == ELFCLASS64);
-	if (!is32 && !is64)
-	  break;
-	if (!is32 && (type == IS_X86_KFREEBSD32 || type == IS_X86_KNETBSD32))
-	  break;
-	if (!is64 && (type == IS_X86_KFREEBSD64 || type == IS_X86_KNETBSD64))
-	  break;
-	ret = 1;
-
-	break;
-      }
-
-
-    case IS_MIPSEL_LINUX:
-      {
-	Elf32_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_machine != grub_cpu_to_le16_compile_time (EM_MIPS)
-	    || ehdr.e_type != grub_cpu_to_le16_compile_time (ET_EXEC))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-    case IS_ARM_LINUX:
-      {
-	grub_uint32_t sig, sig_pi;
-	if (grub_file_read (file, &sig_pi, 4) != 4)
-	  break;
-	/* Raspberry pi.  */
-	if (sig_pi == grub_cpu_to_le32_compile_time (0xea000006))
-	  {
-	    ret = 1;
-	    break;
-	  }
-
-	if (grub_file_seek (file, 0x24) == (grub_size_t) -1)
-	  break;
-	if (grub_file_read (file, &sig, 4) != 4)
-	  break;
-	if (sig == grub_cpu_to_le32_compile_time (0x016f2818))
-	  {
-	    ret = 1;
-	    break;
-	  }
-	break;
-      }
-    case IS_ARM64_LINUX:
-      {
-	grub_uint32_t sig;
-
-	if (grub_file_seek (file, 0x38) == (grub_size_t) -1)
-	  break;
-	if (grub_file_read (file, &sig, 4) != 4)
-	  break;
-	if (sig == grub_cpu_to_le32_compile_time (0x644d5241))
-	  {
-	    ret = 1;
-	    break;
-	  }
-	break;
-      }
-    case IS_PAE_DOMU ... IS_DOM0:
-      {
-	struct grub_xen_file_info xen_inf;
-	elf = grub_xen_file (file);
-	if (!elf)
-	  break;
-	err = grub_xen_get_info (elf, &xen_inf);
-	if (err)
-	  break;
-	/* Unfortuntely no way to check if kernel supports dom0.  */
-	if (type == IS_DOM0)
-	  ret = 1;
-	if (type == IS_PAE_DOMU)
-	  ret = (xen_inf.arch == GRUB_XEN_FILE_I386_PAE
-		 || xen_inf.arch == GRUB_XEN_FILE_I386_PAE_BIMODE);
-	if (type == IS_64_DOMU)
-	  ret = (xen_inf.arch == GRUB_XEN_FILE_X86_64);
-	break;
-      }
-    case IS_MULTIBOOT:
-    case IS_MULTIBOOT2:
-      {
-	grub_uint32_t *buffer;
-	grub_ssize_t len;
-	grub_size_t search_size;
-	grub_uint32_t *header;
-	grub_uint32_t magic;
-	grub_size_t step;
-
-	if (type == IS_MULTIBOOT2)
-	  {
-	    search_size = 32768;
-	    magic = grub_cpu_to_le32_compile_time (0xe85250d6);
-	    step = 2;
-	  }
-	else
-	  {
-	    search_size = 8192;
-	    magic = grub_cpu_to_le32_compile_time (0x1BADB002);
-	    step = 1;
-	  }
-
-	buffer = grub_malloc (search_size);
-	if (!buffer)
-	  break;
-
-	len = grub_file_read (file, buffer, search_size);
-	if (len < 32)
-	  {
-	    grub_free (buffer);
-	    break;
-	  }
-
-	/* Look for the multiboot header in the buffer.  The header should
-	   be at least 12 bytes and aligned on a 4-byte boundary.  */
-	for (header = buffer;
-	     ((char *) header <=
-	      (char *) buffer + len - (type == IS_MULTIBOOT2 ? 16 : 12))
-	     || (header = 0); header += step)
-	  {
-	    if (header[0] == magic
-		&& !(grub_le_to_cpu32 (header[0])
-		     + grub_le_to_cpu32 (header[1])
-		     + grub_le_to_cpu32 (header[2])
-		     + (type == IS_MULTIBOOT2
-			? grub_le_to_cpu32 (header[3]) : 0)))
-	      break;
-	  }
-
-	if (header != 0)
-	  ret = 1;
-	grub_free (buffer);
-	break;
-      }
-    case IS_X86_LINUX32:
-    case IS_X86_LINUX:
-      {
-	struct linux_kernel_header lh;
-	if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
-	  break;
-	if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
-	  break;
-
-	if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
-	  break;
-
-	/* FIXME: some really old kernels (< 1.3.73) will fail this.  */
-	if (lh.header !=
-	    grub_cpu_to_le32_compile_time (GRUB_LINUX_MAGIC_SIGNATURE)
-	    || grub_le_to_cpu16 (lh.version) < 0x0200)
-	  break;
-
-	if (type == IS_X86_LINUX)
-	  {
-	    ret = 1;
-	    break;
-	  }
-
-	/* FIXME: 2.03 is not always good enough (Linux 2.4 can be 2.03 and
-	   still not support 32-bit boot.  */
-	if (lh.header !=
-	    grub_cpu_to_le32_compile_time (GRUB_LINUX_MAGIC_SIGNATURE)
-	    || grub_le_to_cpu16 (lh.version) < 0x0203)
-	  break;
-
-	if (!(lh.loadflags & GRUB_LINUX_FLAG_BIG_KERNEL))
-	  break;
-	ret = 1;
-	break;
-      }
-    case IS_HIBERNATED:
-      {
-	grub_uint8_t hibr_file_magic[4];
-	if (grub_file_read (file, &hibr_file_magic, sizeof (hibr_file_magic))
-	    != sizeof (hibr_file_magic))
-	  break;
-	if (grub_memcmp ("hibr", hibr_file_magic, sizeof (hibr_file_magic)) ==
-	    0
-	    || grub_memcmp ("HIBR", hibr_file_magic,
-			    sizeof (hibr_file_magic)) == 0)
-	  ret = 1;
-	break;
-      }
-    case IS_XNU64:
-    case IS_XNU32:
-      {
-	macho = grub_macho_open (args[0], (type == IS_XNU64));
-	if (!macho)
-	  break;
-	/* FIXME: more checks?  */
-	ret = 1;
-	break;
-      }
-    case IS_XNU_HIBR:
-      {
-	struct grub_xnu_hibernate_header hibhead;
-	if (grub_file_read (file, &hibhead, sizeof (hibhead))
-	    != sizeof (hibhead))
-	  break;
-	if (hibhead.magic !=
-	    grub_cpu_to_le32_compile_time (GRUB_XNU_HIBERNATE_MAGIC))
-	  break;
-	ret = 1;
-	break;
-      }
-    case IS_32_EFI:
-    case IS_64_EFI:
-    case IS_IA_EFI:
-    case IS_ARM64_EFI:
-    case IS_ARM_EFI:
-      {
-	char signature[4];
-	grub_uint32_t pe_offset;
-	struct grub_pe32_coff_header coff_head;
-
-	if (grub_file_read (file, signature, 2) != 2)
-	  break;
-	if (signature[0] != 'M' || signature[1] != 'Z')
-	  break;
-	if ((grub_ssize_t) grub_file_seek (file, 0x3c) == -1)
-	  break;
-	if (grub_file_read (file, &pe_offset, 4) != 4)
-	  break;
-	if ((grub_ssize_t) grub_file_seek (file, grub_le_to_cpu32 (pe_offset))
-	    == -1)
-	  break;
-	if (grub_file_read (file, signature, 4) != 4)
-	  break;
-	if (signature[0] != 'P' || signature[1] != 'E'
-	    || signature[2] != '\0' || signature[3] != '\0')
-	  break;
-
-	if (grub_file_read (file, &coff_head, sizeof (coff_head))
-	    != sizeof (coff_head))
-	  break;
-	if (type == IS_32_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_I386))
-	  break;
-	if (type == IS_64_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_X86_64))
-	  break;
-	if (type == IS_IA_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_IA64))
-	  break;
-	if (type == IS_ARM64_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARM64))
-	  break;
-	if (type == IS_ARM_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARMTHUMB_MIXED))
-	  break;
-	if (type == IS_IA_EFI || type == IS_64_EFI || type == IS_ARM64_EFI)
-	  {
-	    struct grub_pe64_optional_header o64;
-	    if (grub_file_read (file, &o64, sizeof (o64)) != sizeof (o64))
-	      break;
-	    if (o64.magic !=
-		grub_cpu_to_le16_compile_time (GRUB_PE32_PE64_MAGIC))
-	      break;
-	    if (o64.subsystem !=
-		grub_cpu_to_le16_compile_time
-		(GRUB_PE32_SUBSYSTEM_EFI_APPLICATION))
-	      break;
-	    ret = 1;
-	    break;
-	  }
-	if (type == IS_32_EFI || type == IS_ARM_EFI)
-	  {
-	    struct grub_pe32_optional_header o32;
-	    if (grub_file_read (file, &o32, sizeof (o32)) != sizeof (o32))
-	      break;
-	    if (o32.magic !=
-		grub_cpu_to_le16_compile_time (GRUB_PE32_PE32_MAGIC))
-	      break;
-	    if (o32.subsystem !=
-		grub_cpu_to_le16_compile_time
-		(GRUB_PE32_SUBSYSTEM_EFI_APPLICATION))
-	      break;
-	    ret = 1;
-	    break;
-	  }
-	break;
-      }
-    }
-
-  if (elf)
-    grub_elf_close (elf);
-  else if (macho)
-    grub_macho_close (macho);
-  else if (file)
-    grub_file_close (file);
-
-  if (!ret && (grub_errno == GRUB_ERR_BAD_OS || grub_errno == GRUB_ERR_NONE))
-    /* TRANSLATORS: it's a standalone boolean value,
-       opposite of "true".  */
-    grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
-  return grub_errno;
-}
-
-static grub_extcmd_t cmd;
-
-GRUB_MOD_INIT(file)
-{
-  cmd = grub_register_extcmd ("file", grub_cmd_file, 0,
-			      N_("OPTIONS FILE"),
-			      N_("Check if FILE is of specified type."),
-			      options);
-}
-
-GRUB_MOD_FINI(file)
-{
-  grub_unregister_extcmd (cmd);
-}

grub-core/commands/file32.c

@@ -1,5 +0,0 @@
-#define GRUB_TARGET_WORDSIZE 32
-#define XX		32
-#define ehdrXX ehdr32
-#define grub_file_check_netbsdXX grub_file_check_netbsd32
-#include "fileXX.c"

grub-core/commands/file64.c

@@ -1,5 +0,0 @@
-#define GRUB_TARGET_WORDSIZE 64
-#define XX		64
-#define ehdrXX ehdr64
-#define grub_file_check_netbsdXX grub_file_check_netbsd64
-#include "fileXX.c"

grub-core/commands/fileXX.c

@@ -1,70 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/fileid.h>
-#include <grub/elfload.h>
-
-#pragma GCC diagnostic ignored "-Wcast-align"
-
-int
-grub_file_check_netbsdXX (grub_elf_t elf)
-{
-  Elf_Shdr *s, *s0;
-
-  grub_size_t shnum = elf->ehdr.ehdrXX.e_shnum;
-  grub_size_t shentsize = elf->ehdr.ehdrXX.e_shentsize;
-  grub_size_t shsize = shnum * shentsize;
-  grub_off_t stroff;
-
-  if (!shnum || !shentsize)
-    return 0;
-
-  s0 = grub_malloc (shsize);
-  if (!s0)
-    return 0;
-
-  if (grub_file_seek (elf->file, elf->ehdr.ehdrXX.e_shoff) == (grub_off_t) -1)
-    return 0;
-
-  if (grub_file_read (elf->file, s0, shsize) != (grub_ssize_t) shsize)
-    return 0;
-
-  s = (Elf_Shdr *) ((char *) s0 + elf->ehdr.ehdrXX.e_shstrndx * shentsize);
-  stroff = s->sh_offset;
-
-  for (s = s0; s < (Elf_Shdr *) ((char *) s0 + shnum * shentsize);
-       s = (Elf_Shdr *) ((char *) s + shentsize))
-    {
-      char name[sizeof(".note.netbsd.ident")];
-      grub_memset (name, 0, sizeof (name));
-      if (grub_file_seek (elf->file, stroff + s->sh_name) == (grub_off_t) -1)
-	return grub_errno;
-
-      if (grub_file_read (elf->file, name, sizeof (name)) != (grub_ssize_t) sizeof (name))
-	{
-	  if (grub_errno)
-	    return grub_errno;
-	  continue;
-	}
-      if (grub_memcmp (name, ".note.netbsd.ident",
-		       sizeof(".note.netbsd.ident")) != 0)
-	continue;
-      return 1;
-    }
-  return 0;
-}

grub-core/commands/hashsum.c

@@ -63,23 +63,17 @@ hextoval (char c)
 static grub_err_t
 hash_file (grub_file_t file, const gcry_md_spec_t *hash, void *result)
 {
-  void *context;
-  grub_uint8_t *readbuf;
-#define BUF_SIZE 4096
-  readbuf = grub_malloc (BUF_SIZE);
-  if (!readbuf)
-    return grub_errno;
-  context = grub_zalloc (hash->contextsize);
-  if (!readbuf || !context)
-    goto fail;
+  GRUB_PROPERLY_ALIGNED_ARRAY (context, hash->contextsize);
+  grub_uint8_t readbuf[4096];
 
+  grub_memset (context, 0, sizeof (context));
   hash->init (context);
   while (1)
     {
       grub_ssize_t r;
-      r = grub_file_read (file, readbuf, BUF_SIZE);
+      r = grub_file_read (file, readbuf, sizeof (readbuf));
       if (r < 0)
-	goto fail;
+	return grub_errno;
       if (r == 0)
 	break;
       hash->write (context, readbuf, r);
@@ -87,15 +81,7 @@ hash_file (grub_file_t file, const gcry_md_spec_t *hash, void *result)
   hash->final (context);
   grub_memcpy (result, hash->read (context), hash->mdlen);
 
-  grub_free (readbuf);
-  grub_free (context);
-
   return GRUB_ERR_NONE;
-
- fail:
-  grub_free (readbuf);
-  grub_free (context);
-  return grub_errno;
 }
 
 static grub_err_t
@@ -104,15 +90,12 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
 {
   grub_file_t hashlist, file;
   char *buf = NULL;
-  grub_uint8_t expected[GRUB_CRYPTO_MAX_MDLEN];
-  grub_uint8_t actual[GRUB_CRYPTO_MAX_MDLEN];
+  grub_uint8_t expected[hash->mdlen];
+  grub_uint8_t actual[hash->mdlen];
   grub_err_t err;
   unsigned i;
   unsigned unread = 0, mismatch = 0;
 
-  if (hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
-    return grub_error (GRUB_ERR_BUG, "mdlen is too long");
-
   hashlist = grub_file_open (hashfilename);
   if (!hashlist)
     return grub_errno;
@@ -222,9 +205,6 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
   if (!hash)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown hash");
 
-  if (hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
-    return grub_error (GRUB_ERR_BUG, "mdlen is too long");
-
   if (state[2].set)
     prefix = state[2].arg;
 
@@ -238,7 +218,7 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
 
   for (i = 0; i < (unsigned) argc; i++)
     {
-      GRUB_PROPERLY_ALIGNED_ARRAY (result, GRUB_CRYPTO_MAX_MDLEN);
+      GRUB_PROPERLY_ALIGNED_ARRAY (result, hash->mdlen);
       grub_file_t file;
       grub_err_t err;
       unsigned j;

grub-core/commands/i386/cmosdump.c

@@ -55,7 +55,7 @@ GRUB_MOD_INIT(cmosdump)
 {
   cmd = grub_register_command ("cmosdump", grub_cmd_cmosdump,
 			       0,
-			       N_("Show raw dump of the CMOS contents."));
+			       N_("Dump CMOS contents."));
 }
 
 GRUB_MOD_FINI(cmosdump)

grub-core/commands/i386/cmostest.c

@@ -81,25 +81,7 @@ grub_cmd_cmosclean (struct grub_command *cmd __attribute__ ((unused)),
   return grub_cmos_write (byte, value & (~(1 << bit)));
 }
 
-static grub_err_t
-grub_cmd_cmosset (struct grub_command *cmd __attribute__ ((unused)),
-		    int argc, char *argv[])
-{
-  int byte, bit;
-  grub_err_t err;
-  grub_uint8_t value;
-
-  err = parse_args (argc, argv, &byte, &bit);
-  if (err)
-    return err;
-  err = grub_cmos_read (byte, &value);
-  if (err)
-    return err;
-
-  return grub_cmos_write (byte, value | (1 << bit));
-}
-
-static grub_command_t cmd, cmd_clean, cmd_set;
+static grub_command_t cmd, cmd_clean;
 
 
 GRUB_MOD_INIT(cmostest)
@@ -109,16 +91,11 @@ GRUB_MOD_INIT(cmostest)
 			       N_("Test bit at BYTE:BIT in CMOS."));
   cmd_clean = grub_register_command ("cmosclean", grub_cmd_cmosclean,
 				     N_("BYTE:BIT"),
-				     N_("Clear bit at BYTE:BIT in CMOS."));
-  cmd_set = grub_register_command ("cmosset", grub_cmd_cmosset,
-				   N_("BYTE:BIT"),
-				   /* TRANSLATORS: A bit may be either set (1) or clear (0).  */
-				   N_("Set bit at BYTE:BIT in CMOS."));
+				     N_("Clean bit at BYTE:BIT in CMOS."));
 }
 
 GRUB_MOD_FINI(cmostest)
 {
   grub_unregister_command (cmd);
   grub_unregister_command (cmd_clean);
-  grub_unregister_command (cmd_set);
 }

grub-core/commands/i386/coreboot/cb_timestamps.c

@@ -109,7 +109,7 @@ GRUB_MOD_INIT(cbtime)
 {
   cmd_boottime =
     grub_register_command ("coreboot_boottime", grub_cmd_coreboot_boottime,
-			   0, N_("Show coreboot boot time statistics."));
+			   0, N_("Get coreboot boot time statistics."));
 }
 
 GRUB_MOD_FINI(cbtime)

grub-core/commands/i386/cpuid.c

@@ -34,38 +34,19 @@ static const struct grub_arg_option options[] =
     /* TRANSLATORS: "(default)" at the end means that this option is used if
        no argument is specified.  */
     {"long-mode", 'l', 0, N_("Check if CPU supports 64-bit (long) mode (default)."), 0, 0},
-    {"pae", 'p', 0, N_("Check if CPU supports Physical Address Extension."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
-enum
-  {
-    MODE_LM = 0,
-    MODE_PAE = 1
-  };
+#define bit_LM (1 << 29)
 
-enum
-  {
-    bit_PAE = (1 << 6),
-  };
-enum
-  {
-    bit_LM = (1 << 29)
-  };
-
-unsigned char grub_cpuid_has_longmode = 0, grub_cpuid_has_pae = 0;
+unsigned char grub_cpuid_has_longmode = 0;
 
 static grub_err_t
-grub_cmd_cpuid (grub_extcmd_context_t ctxt,
+grub_cmd_cpuid (grub_extcmd_context_t ctxt __attribute__ ((unused)),
 		int argc __attribute__ ((unused)),
 		char **args __attribute__ ((unused)))
 {
-  int val = 0;
-  if (ctxt->state[MODE_PAE].set)
-    val = grub_cpuid_has_pae;
-  else
-    val = grub_cpuid_has_longmode;
-  return val ? GRUB_ERR_NONE
+  return grub_cpuid_has_longmode ? GRUB_ERR_NONE
     /* TRANSLATORS: it's a standalone boolean value,
        opposite of "true".  */
     : grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
@@ -78,7 +59,6 @@ GRUB_MOD_INIT(cpuid)
 #ifdef __x86_64__
   /* grub-emu */
   grub_cpuid_has_longmode = 1;
-  grub_cpuid_has_pae = 1;
 #else
   unsigned int eax, ebx, ecx, edx;
   unsigned int max_level;
@@ -99,12 +79,6 @@ GRUB_MOD_INIT(cpuid)
   if (max_level == 0)
     goto done;
 
-  if (max_level >= 1)
-    {
-      grub_cpuid (1, eax, ebx, ecx, edx);
-      grub_cpuid_has_pae = !!(edx & bit_PAE);
-    }
-
   grub_cpuid (0x80000000, eax, ebx, ecx, edx);
   ext_level = eax;
   if (ext_level < 0x80000000)

grub-core/commands/i386/nthibr.c

@@ -0,0 +1,79 @@
+/* nthibr.c - tests whether an MS Windows system partition is hibernated */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2013  Peter Lustig
+ *  Copyright (C) 2013  Free Software Foundation, Inc.
+ *
+ *  GRUB 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/types.h>
+#include <grub/mm.h>
+#include <grub/file.h>
+#include <grub/misc.h>
+#include <grub/dl.h>
+#include <grub/command.h>
+#include <grub/err.h>
+#include <grub/i18n.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+static grub_err_t
+grub_cmd_nthibr (grub_command_t cmd __attribute__ ((unused)),
+                 int argc, char **args)
+{
+  grub_uint8_t hibr_file_magic[4];
+  grub_file_t hibr_file = 0;
+
+  if (argc != 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
+
+  hibr_file = grub_file_open (args[0]);
+  if (!hibr_file)
+    return grub_errno;
+
+  /* Try to read magic number of 'hiberfil.sys' */
+  if (grub_file_read (hibr_file, hibr_file_magic,
+		      sizeof (hibr_file_magic))
+      != (grub_ssize_t) sizeof (hibr_file_magic))
+    {
+      if (!grub_errno)
+	grub_error (GRUB_ERR_TEST_FAILURE, "false");
+      goto exit;
+    }
+
+  if (!(grub_memcmp ("hibr", hibr_file_magic, sizeof (hibr_file_magic)) == 0
+	|| grub_memcmp ("HIBR", hibr_file_magic, sizeof (hibr_file_magic)) == 0))
+    grub_error (GRUB_ERR_TEST_FAILURE, "false");
+
+ exit:
+  grub_file_close (hibr_file);
+
+  return grub_errno;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT (check_nt_hiberfil)
+{
+  cmd = grub_register_command ("check_nt_hiberfil", grub_cmd_nthibr,
+                               N_("FILE"),
+                               N_("Test whether a hiberfil.sys is "
+                                  "in hibernated state."));
+}
+
+GRUB_MOD_FINI (check_nt_hiberfil)
+{
+  grub_unregister_command (cmd);
+}

grub-core/commands/i386/pc/drivemap.c

@@ -74,7 +74,7 @@ typedef struct drivemap_node
   grub_uint8_t redirto;
 } drivemap_node_t;
 
-typedef struct GRUB_PACKED int13map_node
+typedef struct __attribute__ ((packed)) int13map_node
 {
   grub_uint8_t disknum;
   grub_uint8_t mapto;

grub-core/commands/legacycfg.c

@@ -314,11 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
       /* First try Linux.  */
       if (kernel_type == GUESS_IT || kernel_type == LINUX)
 	{
-#ifdef GRUB_MACHINE_PCBIOS
 	  cmd = grub_command_find ("linux16");
-#else
-	  cmd = grub_command_find ("linux");
-#endif
 	  if (cmd)
 	    {
 	      if (!(cmd->func) (cmd, cutargc, cutargs))
@@ -473,19 +469,10 @@ grub_cmd_legacy_initrd (struct grub_command *mycmd __attribute__ ((unused)),
 
   if (kernel_type == LINUX)
     {
-#ifdef GRUB_MACHINE_PCBIOS
       cmd = grub_command_find ("initrd16");
-#else
-      cmd = grub_command_find ("initrd");
-#endif
       if (!cmd)
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"),
-#ifdef GRUB_MACHINE_PCBIOS
-			   "initrd16"
-#else
-			   "initrd"
-#endif
-			   );
+			   "initrd16");
 
       return cmd->func (cmd, argc, args);
     }
@@ -566,13 +553,8 @@ check_password_md5_real (const char *entered,
   grub_size_t enteredlen = grub_strlen (entered);
   unsigned char alt_result[MD5_HASHLEN];
   unsigned char *digest;
-  grub_uint8_t *ctx;
+  grub_uint8_t ctx[GRUB_MD_MD5->contextsize];
   grub_size_t i;
-  int ret;
-
-  ctx = grub_zalloc (GRUB_MD_MD5->contextsize);
-  if (!ctx)
-    return 0;
 
   GRUB_MD_MD5->init (ctx);
   GRUB_MD_MD5->write (ctx, entered, enteredlen);
@@ -618,9 +600,7 @@ check_password_md5_real (const char *entered,
       GRUB_MD_MD5->final (ctx);
     }
 
-  ret = (grub_crypto_memcmp (digest, pw->hash, MD5_HASHLEN) == 0);
-  grub_free (ctx);
-  return ret;
+  return (grub_crypto_memcmp (digest, pw->hash, MD5_HASHLEN) == 0);
 }
 
 static grub_err_t
@@ -743,37 +723,11 @@ grub_cmd_legacy_password (struct grub_command *mycmd __attribute__ ((unused)),
 					      NULL);
 }
 
-int
-grub_legacy_check_md5_password (int argc, char **args,
-				char *entered)
-{
-  struct legacy_md5_password *pw = NULL;
-  int ret;
-
-  if (args[0][0] != '-' || args[0][1] != '-')
-    {
-      char correct[GRUB_AUTH_MAX_PASSLEN];
-
-      grub_memset (correct, 0, sizeof (correct));
-      grub_strncpy (correct, args[0], sizeof (correct));
-
-      return grub_crypto_memcmp (entered, correct, GRUB_AUTH_MAX_PASSLEN) == 0;
-    }
-
-  pw = parse_legacy_md5 (argc, args);
-
-  if (!pw)
-    return 0;
-
-  ret = check_password_md5_real (entered, pw);
-  grub_free (pw);
-  return ret;
-}
-
 static grub_err_t
 grub_cmd_legacy_check_password (struct grub_command *mycmd __attribute__ ((unused)),
 				int argc, char **args)
 {
+  struct legacy_md5_password *pw = NULL;
   char entered[GRUB_AUTH_MAX_PASSLEN];
 
   if (argc == 0)
@@ -782,8 +736,24 @@ grub_cmd_legacy_check_password (struct grub_command *mycmd __attribute__ ((unuse
   if (!grub_password_get (entered, GRUB_AUTH_MAX_PASSLEN))
     return GRUB_ACCESS_DENIED;
 
-  if (!grub_legacy_check_md5_password (argc, args,
-				       entered))
+  if (args[0][0] != '-' || args[0][1] != '-')
+    {
+      char correct[GRUB_AUTH_MAX_PASSLEN];
+
+      grub_memset (correct, 0, sizeof (correct));
+      grub_strncpy (correct, args[0], sizeof (correct));
+
+      if (grub_crypto_memcmp (entered, correct, GRUB_AUTH_MAX_PASSLEN) != 0)
+	return GRUB_ACCESS_DENIED;
+      return GRUB_ERR_NONE;
+    }
+
+  pw = parse_legacy_md5 (argc, args);
+
+  if (!pw)
+    return GRUB_ACCESS_DENIED;
+
+  if (!check_password_md5_real (entered, pw))
     return GRUB_ACCESS_DENIED;
 
   return GRUB_ERR_NONE;

grub-core/commands/loadenv.c

@@ -455,7 +455,7 @@ GRUB_MOD_INIT(loadenv)
 {
   cmd_load =
     grub_register_extcmd ("load_env", grub_cmd_load_env, 0,
-			  N_("[-f FILE] [-s|--skip-sig] [variable_name_to_whitelist] [...]"),
+			  N_("[-f FILE] [-s|--skip-sig] [whitelisted_variable_name] [...]"),
 			  N_("Load variables from environment block file."),
 			  options);
   cmd_list =

grub-core/commands/macbless.c

@@ -1,236 +0,0 @@
-/* hfspbless.c - set the hfs+ boot directory.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2005,2007,2008,2009,2012,2013  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/command.h>
-#include <grub/fs.h>
-#include <grub/misc.h>
-#include <grub/dl.h>
-#include <grub/device.h>
-#include <grub/disk.h>
-#include <grub/hfsplus.h>
-#include <grub/hfs.h>
-#include <grub/partition.h>
-#include <grub/file.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-struct find_node_context
-{
-  grub_uint64_t inode_found;
-  char *dirname;
-  enum
-  { NONE, FILE, DIR } found;
-};
-
-static int
-find_inode (const char *filename,
-	    const struct grub_dirhook_info *info, void *data)
-{
-  struct find_node_context *ctx = data;
-  if (!info->inodeset)
-    return 0;
-
-  if ((grub_strcmp (ctx->dirname, filename) == 0
-       || (info->case_insensitive
-	   && grub_strcasecmp (ctx->dirname, filename) == 0)))
-    {
-      ctx->inode_found = info->inode;
-      ctx->found = info->dir ? DIR : FILE;
-    }
-  return 0;
-}
-
-grub_err_t
-grub_mac_bless_inode (grub_device_t dev, grub_uint32_t inode, int is_dir,
-		      int intel)
-{
-  grub_err_t err;
-  union
-  {
-    struct grub_hfs_sblock hfs;
-    struct grub_hfsplus_volheader hfsplus;
-  } volheader;
-  grub_disk_addr_t embedded_offset;
-
-  if (intel && is_dir)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-		       "can't bless a directory for mactel");
-  if (!intel && !is_dir)
-    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		       "can't bless a file for mac PPC");
-
-  /* Read the bootblock.  */
-  err = grub_disk_read (dev->disk, GRUB_HFSPLUS_SBLOCK, 0, sizeof (volheader),
-			(char *) &volheader);
-  if (err)
-    return err;
-
-  embedded_offset = 0;
-  if (grub_be_to_cpu16 (volheader.hfs.magic) == GRUB_HFS_MAGIC)
-    {
-      int extent_start;
-      int ablk_size;
-      int ablk_start;
-
-      /* See if there's an embedded HFS+ filesystem.  */
-      if (grub_be_to_cpu16 (volheader.hfs.embed_sig) != GRUB_HFSPLUS_MAGIC)
-	{
-	  if (intel)
-	    volheader.hfs.intel_bootfile = grub_be_to_cpu32 (inode);
-	  else
-	    volheader.hfs.ppc_bootdir = grub_be_to_cpu32 (inode);
-	  return GRUB_ERR_NONE;
-	}
-
-      /* Calculate the offset needed to translate HFS+ sector numbers.  */
-      extent_start =
-	grub_be_to_cpu16 (volheader.hfs.embed_extent.first_block);
-      ablk_size = grub_be_to_cpu32 (volheader.hfs.blksz);
-      ablk_start = grub_be_to_cpu16 (volheader.hfs.first_block);
-      embedded_offset = (ablk_start
-			 + extent_start
-			 * (ablk_size >> GRUB_DISK_SECTOR_BITS));
-
-      err =
-	grub_disk_read (dev->disk, embedded_offset + GRUB_HFSPLUS_SBLOCK, 0,
-			sizeof (volheader), (char *) &volheader);
-      if (err)
-	return err;
-    }
-
-  if ((grub_be_to_cpu16 (volheader.hfsplus.magic) != GRUB_HFSPLUS_MAGIC)
-      && (grub_be_to_cpu16 (volheader.hfsplus.magic) != GRUB_HFSPLUSX_MAGIC))
-    return grub_error (GRUB_ERR_BAD_FS, "not a HFS+ filesystem");
-  if (intel)
-    volheader.hfsplus.intel_bootfile = grub_be_to_cpu32 (inode);
-  else
-    volheader.hfsplus.ppc_bootdir = grub_be_to_cpu32 (inode);
-
-  return grub_disk_write (dev->disk, embedded_offset + GRUB_HFSPLUS_SBLOCK, 0,
-			  sizeof (volheader), (char *) &volheader);
-}
-
-grub_err_t
-grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
-{
-  grub_fs_t fs;
-
-  char *path, *tail;
-  struct find_node_context ctx;
-
-  fs = grub_fs_probe (dev);
-  if (!fs || (grub_strcmp (fs->name, "hfsplus") != 0
-	      && grub_strcmp (fs->name, "hfs") != 0))
-    return grub_error (GRUB_ERR_BAD_FS, "no suitable FS found");
-
-  path = grub_strdup (path_in);
-  if (!path)
-    return grub_errno;
-
-  tail = path + grub_strlen (path) - 1;
-
-  /* Remove trailing '/'. */
-  while (tail != path && *tail == '/')
-    *(tail--) = 0;
-
-  tail = grub_strrchr (path, '/');
-  ctx.found = 0;
-
-  if (tail)
-    {
-      *tail = 0;
-      ctx.dirname = tail + 1;
-
-      (fs->dir) (dev, *path == 0 ? "/" : path, find_inode, &ctx);
-    }
-  else
-    {
-      ctx.dirname = path + 1;
-      (fs->dir) (dev, "/", find_inode, &ctx);
-    }
-  if (!ctx.found)
-    {
-      grub_free (path);
-      return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"),
-			 path_in);
-    }
-  grub_free (path);
-
-  return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found,
-			       (ctx.found == DIR), intel);
-}
-
-static grub_err_t
-grub_cmd_macbless (grub_command_t cmd, int argc, char **args)
-{
-  char *device_name;
-  char *path = 0;
-  grub_device_t dev;
-  grub_err_t err;
-
-  if (argc != 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
-  device_name = grub_file_get_device_name (args[0]);
-  dev = grub_device_open (device_name);
-
-  path = grub_strchr (args[0], ')');
-  if (!path)
-    path = args[0];
-  else
-    path = path + 1;
-
-  if (!path || *path == 0 || !device_name)
-    {
-      if (dev)
-	grub_device_close (dev);
-
-      grub_free (device_name);
-      grub_free (path);
-
-      return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid argument");
-    }
-
-  err = grub_mac_bless_file (dev, path, cmd->name[3] == 't');
-
-  grub_device_close (dev);
-  grub_free (device_name);
-  return err;
-}
-
-static grub_command_t cmd, cmd_ppc;
-
-GRUB_MOD_INIT(macbless)
-{
-  cmd = grub_register_command ("mactelbless", grub_cmd_macbless,
-			       N_("FILE"),
-			       N_
-			       ("Bless FILE of HFS or HFS+ partition for intel macs."));
-  cmd_ppc =
-    grub_register_command ("macppcbless", grub_cmd_macbless, N_("DIR"),
-			   N_
-			   ("Bless DIR of HFS or HFS+ partition for PPC macs."));
-}
-
-GRUB_MOD_FINI(macbless)
-{
-  grub_unregister_command (cmd);
-  grub_unregister_command (cmd_ppc);
-}

grub-core/commands/minicmd.c

@@ -101,18 +101,12 @@ grub_mini_cmd_dump (struct grub_command *cmd __attribute__ ((unused)),
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no address specified");
 
-#if GRUB_CPU_SIZEOF_VOID_P == GRUB_CPU_SIZEOF_LONG
-#define grub_strtoaddr grub_strtoul
-#else
-#define grub_strtoaddr grub_strtoull
-#endif
-
-  addr = (grub_uint8_t *) grub_strtoaddr (argv[0], 0, 0);
+  addr = (grub_uint8_t *) grub_strtoul (argv[0], 0, 0);
   if (grub_errno)
     return grub_errno;
 
   if (argc > 1)
-    size = (grub_size_t) grub_strtoaddr (argv[1], 0, 0);
+    size = (grub_size_t) grub_strtoul (argv[1], 0, 0);
 
   while (size--)
     {

grub-core/commands/nativedisk.c

@@ -70,12 +70,12 @@ get_uuid (const char *name, char **uuid, int getnative)
     case GRUB_DISK_DEVICE_ARCDISK_ID:
     case GRUB_DISK_DEVICE_HOSTDISK_ID:
     case GRUB_DISK_DEVICE_UBOOTDISK_ID:
+    case GRUB_DISK_DEVICE_SRMDISK_ID:
       break;
 
       /* Native disks.  */
     case GRUB_DISK_DEVICE_ATA_ID:
     case GRUB_DISK_DEVICE_SCSI_ID:
-    case GRUB_DISK_DEVICE_XEN:
       if (getnative)
 	break;
 

grub-core/commands/parttool.c

@@ -133,7 +133,7 @@ show_help (grub_device_t dev)
 	  }
       }
   if (! found)
-    grub_printf_ (N_("Sorry, no parttool is available for %s\n"),
+    grub_printf_ (N_("Sorry no parttool is available for %s\n"),
 		  dev->disk->partition->partmap->name);
   return GRUB_ERR_NONE;
 }

grub-core/commands/pcidump.c

@@ -166,7 +166,7 @@ GRUB_MOD_INIT(pcidump)
 {
   cmd = grub_register_extcmd ("pcidump", grub_cmd_pcidump, 0,
 			      N_("[-s POSITION] [-d DEVICE]"),
-			      N_("Show raw dump of the PCI configuration space."), options);
+			      N_("Dump PCI configuration space."), options);
 }
 
 GRUB_MOD_FINI(pcidump)

grub-core/commands/syslinuxcfg.c

@@ -1,214 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/extcmd.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/dl.h>
-#include <grub/file.h>
-#include <grub/normal.h>
-#include <grub/script_sh.h>
-#include <grub/i18n.h>
-#include <grub/term.h>
-#include <grub/syslinux_parse.h>
-#include <grub/crypto.h>
-#include <grub/auth.h>
-#include <grub/disk.h>
-#include <grub/partition.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-/* Helper for syslinux_file.  */
-static grub_err_t
-syslinux_file_getline (char **line, int cont __attribute__ ((unused)),
-		     void *data __attribute__ ((unused)))
-{
-  *line = 0;
-  return GRUB_ERR_NONE;
-}
-
-static const struct grub_arg_option options[] =
-  {
-    {"root",  'r', 0,
-     N_("root directory of the syslinux disk [default=/]."),
-     N_("DIR"), ARG_TYPE_STRING},
-    {"cwd",  'c', 0,
-     N_("current directory of the syslinux [default is parent directory of input file]."),
-     N_("DIR"), ARG_TYPE_STRING},
-    {"isolinux",     'i',  0, N_("assume input is an isolinux configuration file."), 0, 0},
-    {"pxelinux",     'p',  0, N_("assume input is a pxelinux configuration file."), 0, 0},
-    {"syslinux",     's',  0, N_("assume input is a syslinux configuration file."), 0, 0},
-    {0, 0, 0, 0, 0, 0}
-  };
-
-enum
-  {
-    OPTION_ROOT,
-    OPTION_CWD,
-    OPTION_ISOLINUX,
-    OPTION_PXELINUX,
-    OPTION_SYSLINUX
-  };
-
-static grub_err_t
-syslinux_file (grub_extcmd_context_t ctxt, const char *filename)
-{
-  char *result;
-  const char *root = ctxt->state[OPTION_ROOT].set ? ctxt->state[OPTION_ROOT].arg : "/";
-  const char *cwd = ctxt->state[OPTION_CWD].set ? ctxt->state[OPTION_CWD].arg : NULL;
-  grub_syslinux_flavour_t flav = GRUB_SYSLINUX_UNKNOWN;
-  char *cwdf = NULL;
-  grub_menu_t menu;
-
-  if (ctxt->state[OPTION_ISOLINUX].set)
-    flav = GRUB_SYSLINUX_ISOLINUX;
-  if (ctxt->state[OPTION_PXELINUX].set)
-    flav = GRUB_SYSLINUX_PXELINUX;
-  if (ctxt->state[OPTION_SYSLINUX].set)
-    flav = GRUB_SYSLINUX_SYSLINUX;
-
-  if (!cwd)
-    {
-      char *p;
-      cwdf = grub_strdup (filename);
-      if (!cwdf)
-	return grub_errno;
-      p = grub_strrchr (cwdf, '/');
-      if (!p)
-	{
-	  grub_free (cwdf);
-	  cwd = "/";
-	  cwdf = NULL;
-	}
-      else
-	{
-	  *p = '\0';
-	  cwd = cwdf;
-	}
-    }
-
-  grub_dprintf ("syslinux",
-		"transforming syslinux config %s, root = %s, cwd = %s\n",
-		filename, root, cwd);
-
-  result = grub_syslinux_config_file (root, root, cwd, cwd, filename, flav);
-  if (!result)
-    return grub_errno;
-
-  grub_dprintf ("syslinux", "syslinux config transformed\n");
-
-  menu = grub_env_get_menu ();
-  if (! menu)
-    {
-      menu = grub_zalloc (sizeof (*menu));
-      if (! menu)
-	return grub_errno;
-
-      grub_env_set_menu (menu);
-    }
-
-  grub_normal_parse_line (result, syslinux_file_getline, NULL);
-  grub_print_error ();
-  grub_free (result);
-  grub_free (cwdf);
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_cmd_syslinux_source (grub_extcmd_context_t ctxt,
-			  int argc, char **args)
-{
-  int new_env, extractor;
-  grub_err_t ret;
-
-  if (argc != 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-
-  extractor = (ctxt->extcmd->cmd->name[0] == 'e');
-  new_env = (ctxt->extcmd->cmd->name[extractor ? (sizeof ("extract_syslinux_entries_") - 1)
-			     : (sizeof ("syslinux_") - 1)] == 'c');
-
-  if (new_env)
-    grub_cls ();
-
-  if (new_env && !extractor)
-    grub_env_context_open ();
-  if (extractor)
-    grub_env_extractor_open (!new_env);
-
-  ret = syslinux_file (ctxt, args[0]);
-
-  if (new_env)
-    {
-      grub_menu_t menu;
-      menu = grub_env_get_menu ();
-      if (menu && menu->size)
-	grub_show_menu (menu, 1, 0);
-      if (!extractor)
-	grub_env_context_close ();
-    }
-  if (extractor)
-    grub_env_extractor_close (!new_env);
-
-  return ret;
-}
-
-
-static grub_extcmd_t cmd_source, cmd_configfile;
-static grub_extcmd_t cmd_source_extract, cmd_configfile_extract;
-
-GRUB_MOD_INIT(syslinuxcfg)
-{
-  cmd_source
-    = grub_register_extcmd ("syslinux_source",
-			    grub_cmd_syslinux_source, 0,
-			    N_("FILE"),
-			    /* TRANSLATORS: "syslinux config" means
-			       "config as used by syslinux".  */
-			    N_("Execute syslinux config in same context"),
-			    options);
-  cmd_configfile
-    = grub_register_extcmd ("syslinux_configfile",
-			    grub_cmd_syslinux_source, 0,
-			    N_("FILE"),
-			    N_("Execute syslinux config in new context"),
-			    options);
-  cmd_source_extract
-    = grub_register_extcmd ("extract_syslinux_entries_source",
-			    grub_cmd_syslinux_source, 0,
-			    N_("FILE"),
-			    N_("Execute syslinux config in same context taking only menu entries"),
-			    options);
-  cmd_configfile_extract
-    = grub_register_extcmd ("extract_syslinux_entries_configfile",
-			    grub_cmd_syslinux_source, 0,
-			    N_("FILE"),
-			    N_("Execute syslinux config in new context taking only menu entries"),
-			    options);
-}
-
-GRUB_MOD_FINI(syslinuxcfg)
-{
-  grub_unregister_extcmd (cmd_source);
-  grub_unregister_extcmd (cmd_configfile);
-  grub_unregister_extcmd (cmd_source_extract);
-  grub_unregister_extcmd (cmd_configfile_extract);
-}

grub-core/commands/tr.c

@@ -29,7 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 static const struct grub_arg_option options[] =
   {
-    { "set", 's', 0, N_("Set a variable to return value."), N_("VARNAME"), ARG_TYPE_STRING },
+    { "set", 's', 0, N_("Variable name to update."), N_("VARNAME"), ARG_TYPE_STRING },
     { "upcase", 'U', 0, N_("Translate to upper case."), 0, 0 },
     { "downcase", 'D', 0, N_("Translate to lower case."), 0, 0 },
     { 0, 0, 0, 0, 0, 0 }

grub-core/commands/verify.c

@@ -41,7 +41,7 @@ enum
 static const struct grub_arg_option options[] =
   {
     {"skip-sig", 's', 0,
-     N_("Skip signature-checking of the public key file."), 0, ARG_TYPE_NONE},
+     N_("Skip signature-checking of the signature file."), 0, ARG_TYPE_NONE},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -133,7 +133,7 @@ struct signature_v4_header
   grub_uint8_t pkeyalgo;
   grub_uint8_t hash;
   grub_uint16_t hashed_sub;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 const char *hashes[] = {
   [0x01] = "md5",
@@ -192,39 +192,22 @@ free_pk (struct grub_public_key *pk)
   struct grub_public_subkey *nsk, *sk;
   for (sk = pk->subkeys; sk; sk = nsk)
     {
-      grub_size_t i;
-      for (i = 0; i < ARRAY_SIZE (sk->mpis); i++)
-	if (sk->mpis[i])
-	  gcry_mpi_release (sk->mpis[i]);
       nsk = sk->next;
       grub_free (sk);
     }
   grub_free (pk);
 }
 
-#define READBUF_SIZE 4096
-
 struct grub_public_key *
 grub_load_public_key (grub_file_t f)
 {
   grub_err_t err;
   struct grub_public_key *ret;
   struct grub_public_subkey **last = 0;
-  void *fingerprint_context = NULL;
-  grub_uint8_t *buffer = NULL;
 
   ret = grub_zalloc (sizeof (*ret));
   if (!ret)
-    {
-      grub_free (fingerprint_context);
-      return NULL;
-    }
-
-  buffer = grub_zalloc (READBUF_SIZE);
-  fingerprint_context = grub_zalloc (GRUB_MD_SHA1->contextsize);
-
-  if (!buffer || !fingerprint_context)
-    goto fail;
+    return NULL;
 
   last = &ret->subkeys;
 
@@ -238,6 +221,7 @@ grub_load_public_key (grub_file_t f)
       struct grub_public_subkey *sk;
       grub_size_t i;
       grub_uint16_t len_be;
+      GRUB_PROPERLY_ALIGNED_ARRAY (fingerprint_context, GRUB_MD_SHA1->contextsize);
 
       err = read_packet_header (f, &type, &len);
 
@@ -246,11 +230,7 @@ grub_load_public_key (grub_file_t f)
       if (type == 0xfe)
 	continue;
       if (type == 0xff)
-	{
-	  grub_free (fingerprint_context);
-	  grub_free (buffer);
-	  return ret;
-	}
+	return ret;
 
       grub_dprintf ("crypt", "len = %x\n", (int) len);
 
@@ -314,6 +294,7 @@ grub_load_public_key (grub_file_t f)
 	{
 	  grub_uint16_t l;
 	  grub_size_t lb;
+	  grub_uint8_t buffer[4096];
 	  if (grub_file_read (f, &l, sizeof (l)) != sizeof (l))
 	    {
 	      grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
@@ -321,7 +302,7 @@ grub_load_public_key (grub_file_t f)
 	    }
 	  
 	  lb = (grub_be_to_cpu16 (l) + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT;
-	  if (lb > READBUF_SIZE - sizeof (grub_uint16_t))
+	  if (lb > sizeof (buffer) - sizeof (grub_uint16_t))
 	    {
 	      grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
 	      goto fail;
@@ -356,8 +337,6 @@ grub_load_public_key (grub_file_t f)
     }
  fail:
   free_pk (ret);
-  grub_free (fingerprint_context);
-  grub_free (buffer);
   return NULL;
 }
 
@@ -485,7 +464,7 @@ grub_verify_signature_real (char *buf, grub_size_t size,
   grub_dprintf ("crypt", "alive\n");
 
   {
-    void *context = NULL;
+    GRUB_PROPERLY_ALIGNED_ARRAY (context, hash->contextsize);
     unsigned char *hval;
     grub_ssize_t rem = grub_be_to_cpu16 (v4.hashed_sub);
     grub_uint32_t headlen = grub_cpu_to_be32 (rem + 6);
@@ -496,22 +475,18 @@ grub_verify_signature_real (char *buf, grub_size_t size,
     gcry_mpi_t hmpi;
     grub_uint64_t keyid = 0;
     struct grub_public_subkey *sk;
-    grub_uint8_t *readbuf = NULL;
-
-    context = grub_zalloc (hash->contextsize);
-    readbuf = grub_zalloc (READBUF_SIZE);
-    if (!context || !readbuf)
-      goto fail;
 
+    grub_memset (context, 0, sizeof (context));
     hash->init (context);
     if (buf)
       hash->write (context, buf, size);
     else 
       while (1)
 	{
-	  r = grub_file_read (f, readbuf, READBUF_SIZE);
+	  grub_uint8_t readbuf[4096];
+	  r = grub_file_read (f, readbuf, sizeof (readbuf));
 	  if (r < 0)
-	    goto fail;
+	    return grub_errno;
 	  if (r == 0)
 	    break;
 	  hash->write (context, readbuf, r);
@@ -521,10 +496,10 @@ grub_verify_signature_real (char *buf, grub_size_t size,
     hash->write (context, &v4, sizeof (v4));
     while (rem)
       {
-	r = grub_file_read (sig, readbuf,
-			    rem < READBUF_SIZE ? rem : READBUF_SIZE);
+	grub_uint8_t readbuf[4096];
+	r = grub_file_read (sig, readbuf, rem < (grub_ssize_t) sizeof (readbuf) ? rem : (grub_ssize_t) sizeof (readbuf));
 	if (r < 0)
-	  goto fail;
+	  return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
 	if (r == 0)
 	  break;
 	hash->write (context, readbuf, r);
@@ -536,16 +511,17 @@ grub_verify_signature_real (char *buf, grub_size_t size,
     hash->write (context, &headlen, sizeof (headlen));
     r = grub_file_read (sig, &unhashed_sub, sizeof (unhashed_sub));
     if (r != sizeof (unhashed_sub))
-      goto fail;
+      return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
     {
+      grub_uint8_t readbuf[4096];
       grub_uint8_t *ptr;
       grub_uint32_t l;
       rem = grub_be_to_cpu16 (unhashed_sub);
-      if (rem > READBUF_SIZE)
-	goto fail;
+      if (rem > (int) sizeof (readbuf))
+	return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
       r = grub_file_read (sig, readbuf, rem);
       if (r != rem)
-	goto fail;
+	return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
       for (ptr = readbuf; ptr < readbuf + rem; ptr += l)
 	{
 	  if (*ptr < 192)
@@ -576,9 +552,9 @@ grub_verify_signature_real (char *buf, grub_size_t size,
     hval = hash->read (context);
 
     if (grub_file_read (sig, hash_start, sizeof (hash_start)) != sizeof (hash_start))
-      goto fail;
+      return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
     if (grub_memcmp (hval, hash_start, sizeof (hash_start)) != 0)
-      goto fail;
+      return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
 
     grub_dprintf ("crypt", "@ %x\n", (int)grub_file_tell (sig));
 
@@ -586,24 +562,25 @@ grub_verify_signature_real (char *buf, grub_size_t size,
       {
 	grub_uint16_t l;
 	grub_size_t lb;
+	grub_uint8_t buffer[4096];
 	grub_dprintf ("crypt", "alive\n");
 	if (grub_file_read (sig, &l, sizeof (l)) != sizeof (l))
-	  goto fail;
+	  return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
 	grub_dprintf ("crypt", "alive\n");
 	lb = (grub_be_to_cpu16 (l) + 7) / 8;
 	grub_dprintf ("crypt", "l = 0x%04x\n", grub_be_to_cpu16 (l));
-	if (lb > READBUF_SIZE - sizeof (grub_uint16_t))
-	  goto fail;
+	if (lb > sizeof (buffer) - sizeof (grub_uint16_t))
+	  return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
 	grub_dprintf ("crypt", "alive\n");
-	if (grub_file_read (sig, readbuf + sizeof (grub_uint16_t), lb) != (grub_ssize_t) lb)
-	  goto fail;
+	if (grub_file_read (sig, buffer + sizeof (grub_uint16_t), lb) != (grub_ssize_t) lb)
+	  return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
 	grub_dprintf ("crypt", "alive\n");
-	grub_memcpy (readbuf, &l, sizeof (l));
+	grub_memcpy (buffer, &l, sizeof (l));
 	grub_dprintf ("crypt", "alive\n");
 
 	if (gcry_mpi_scan (&mpis[i], GCRYMPI_FMT_PGP,
-			   readbuf, lb + sizeof (grub_uint16_t), 0))
-	  goto fail;
+			   buffer, lb + sizeof (grub_uint16_t), 0))
+	  return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
 	grub_dprintf ("crypt", "alive\n");
       }
 
@@ -612,42 +589,18 @@ grub_verify_signature_real (char *buf, grub_size_t size,
     else
       sk = grub_crypto_pk_locate_subkey_in_trustdb (keyid);
     if (!sk)
-      {
-	/* TRANSLATORS: %08x is 32-bit key id.  */
-	grub_error (GRUB_ERR_BAD_SIGNATURE, N_("public key %08x not found"),
-		    keyid);
-	goto fail;
-      }
+      /* TRANSLATORS: %08x is 32-bit key id.  */
+      return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("public key %08x not found"), keyid);
 
     if (pkalgos[pk].pad (&hmpi, hval, hash, sk))
-      goto fail;
-    if (!*pkalgos[pk].algo)
-      {
-	grub_dl_load (pkalgos[pk].module);
-	grub_errno = GRUB_ERR_NONE;
-      }
-
-    if (!*pkalgos[pk].algo)
-      {
-	grub_error (GRUB_ERR_BAD_SIGNATURE, N_("module `%s' isn't loaded"),
-		    pkalgos[pk].module);
-	goto fail;
-      }
-    if ((*pkalgos[pk].algo)->verify (0, hmpi, mpis, sk->mpis, 0, 0))
-      goto fail;
-
-    grub_free (context);
-    grub_free (readbuf);
-
-    return GRUB_ERR_NONE;
-
-  fail:
-    grub_free (context);
-    grub_free (readbuf);
-    if (!grub_errno)
       return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
-    return grub_errno;
+    if (!*pkalgos[pk].algo)
+      return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("module `%s' isn't loaded"), pkalgos[pk].module);
+    if ((*pkalgos[pk].algo)->verify (0, hmpi, mpis, sk->mpis, 0, 0))
+      return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
   }
+
+  return GRUB_ERR_NONE;
 }
 
 grub_err_t
@@ -744,8 +697,8 @@ static grub_err_t
 grub_cmd_verify_signature (grub_extcmd_context_t ctxt,
 			   int argc, char **args)
 {
-  grub_file_t f = NULL, sig = NULL;
-  grub_err_t err = GRUB_ERR_NONE;
+  grub_file_t f, sig;
+  grub_err_t err;
   struct grub_public_key *pk = NULL;
 
   grub_dprintf ("crypt", "alive\n");
@@ -776,27 +729,19 @@ grub_cmd_verify_signature (grub_extcmd_context_t ctxt,
   grub_file_filter_disable_all ();
   f = grub_file_open (args[0]);
   if (!f)
-    {
-      err = grub_errno;
-      goto fail;
-    }
+    return grub_errno;
 
   grub_file_filter_disable_all ();
   sig = grub_file_open (args[1]);
   if (!sig)
     {
-      err = grub_errno;
-      goto fail;
+      grub_file_close (f);
+      return grub_errno;
     }
 
   err = grub_verify_signature (f, sig, pk);
- fail:
-  if (sig)
-    grub_file_close (sig);
-  if (f)
-    grub_file_close (f);
-  if (pk)
-    free_pk (pk);
+  grub_file_close (f);
+  grub_file_close (sig);
   return err;
 }
 
@@ -885,7 +830,6 @@ grub_pubkey_open (grub_file_t io, const char *filename)
   if (err)
     return NULL;
   io->device = 0;
-  io->name = 0;
   grub_file_close (io);
   return ret;
 }
@@ -966,14 +910,14 @@ GRUB_MOD_INIT(verify)
 			      options);
   cmd_trust = grub_register_extcmd ("trust", grub_cmd_trust, 0,
 				     N_("[-s|--skip-sig] PUBKEY_FILE"),
-				     N_("Add PUBKEY_FILE to trusted keys."),
+				     N_("Add PKFILE to trusted keys."),
 				     options);
   cmd_list = grub_register_command ("list_trusted", grub_cmd_list,
 				    0,
-				    N_("Show the list of trusted keys."));
+				    N_("List trusted keys."));
   cmd_distrust = grub_register_command ("distrust", grub_cmd_distrust,
 					N_("PUBKEY_ID"),
-					N_("Remove PUBKEY_ID from trusted keys."));
+					N_("Remove KEYID from trusted keys."));
 }
 
 GRUB_MOD_FINI(verify)

grub-core/commands/xen/lsxen.c

@@ -1,90 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2011  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-#include <grub/xen.h>
-#include <grub/term.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-static int
-hook (const char *dir, void *hook_data __attribute__ ((unused)))
-{
-  grub_printf ("%s\n", dir);
-  return 0;
-}
-
-static grub_err_t
-grub_cmd_lsxen (grub_command_t cmd __attribute__ ((unused)),
-		int argc, char **args)
-{
-  char *dir;
-  grub_err_t err;
-  char *buf;
-
-  if (argc >= 1)
-    return grub_xenstore_dir (args[0], hook, NULL);
-
-  buf = grub_xenstore_get_file ("domid", NULL);
-  if (!buf)
-    return grub_errno;
-  dir = grub_xasprintf ("/local/domain/%s", buf);
-  grub_free (buf);
-  err = grub_xenstore_dir (dir, hook, NULL);
-  grub_free (dir);
-  return err;
-}
-
-static grub_err_t
-grub_cmd_catxen (grub_command_t cmd __attribute__ ((unused)),
-		 int argc, char **args)
-{
-  const char *dir = "domid";
-  char *buf;
-
-  if (argc >= 1)
-    dir = args[0];
-
-  buf = grub_xenstore_get_file (dir, NULL);
-  if (!buf)
-    return grub_errno;
-  grub_xputs (buf);
-  grub_xputs ("\n");
-  grub_free (buf);
-  return GRUB_ERR_NONE;
-
-}
-
-static grub_command_t cmd_ls, cmd_cat;
-
-GRUB_MOD_INIT (lsxen)
-{
-  cmd_ls = grub_register_command ("xen_ls", grub_cmd_lsxen, N_("[DIR]"),
-				  N_("List Xen storage."));
-  cmd_cat = grub_register_command ("xen_cat", grub_cmd_catxen, N_("[DIR]"),
-				   N_("List Xen storage."));
-}
-
-GRUB_MOD_FINI (lsxen)
-{
-  grub_unregister_command (cmd_ls);
-  grub_unregister_command (cmd_cat);
-}

grub-core/commands/xnu_uuid.c

@@ -50,7 +50,7 @@ grub_cmd_xnu_uuid (grub_command_t cmd __attribute__ ((unused)),
   grub_uint8_t *xnu_uuid;
   char uuid_string[sizeof ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
   char *ptr;
-  void *ctx;
+  grub_uint8_t ctx[GRUB_MD_MD5->contextsize];
   int low = 0;
 
   if (argc < 1)
@@ -65,14 +65,11 @@ grub_cmd_xnu_uuid (grub_command_t cmd __attribute__ ((unused)),
 
   serial = grub_cpu_to_be64 (grub_strtoull (args[0], 0, 16));
 
-  ctx = grub_zalloc (GRUB_MD_MD5->contextsize);
-  if (!ctx)
-    return grub_errno;
-  GRUB_MD_MD5->init (ctx);
-  GRUB_MD_MD5->write (ctx, hash_prefix, sizeof (hash_prefix));
-  GRUB_MD_MD5->write (ctx, &serial, sizeof (serial));
-  GRUB_MD_MD5->final (ctx);
-  xnu_uuid = GRUB_MD_MD5->read (ctx);
+  GRUB_MD_MD5->init (&ctx);
+  GRUB_MD_MD5->write (&ctx, hash_prefix, sizeof (hash_prefix));
+  GRUB_MD_MD5->write (&ctx, &serial, sizeof (serial));
+  GRUB_MD_MD5->final (&ctx);
+  xnu_uuid = GRUB_MD_MD5->read (&ctx);
 
   grub_snprintf (uuid_string, sizeof (uuid_string),
 		"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
@@ -94,8 +91,6 @@ grub_cmd_xnu_uuid (grub_command_t cmd __attribute__ ((unused)),
   if (argc > 1)
     grub_env_set (args[1], uuid_string);
 
-  grub_free (ctx);
-
   return GRUB_ERR_NONE;
 }
 

grub-core/disk/AFSplitter.c

@@ -37,8 +37,8 @@ diffuse (const gcry_md_spec_t * hash, grub_uint8_t * src,
 
   grub_size_t fullblocks = size / hash->mdlen;
   int padding = size % hash->mdlen;
-  grub_uint8_t final[GRUB_CRYPTO_MAX_MDLEN];
-  grub_uint8_t temp[sizeof (IV) + GRUB_CRYPTO_MAX_MDLEN];
+  grub_uint8_t final[hash->mdlen];
+  grub_uint8_t temp[sizeof (IV) + hash->mdlen];
 
   /* hash block the whole data set with different IVs to produce
    * more than just a single data block
@@ -76,9 +76,6 @@ AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src, grub_uint8_t * dst,
   if (bufblock == NULL)
     return GPG_ERR_OUT_OF_MEMORY;
 
-  if (hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
-    return GPG_ERR_INV_ARG;
-
   grub_memset (bufblock, 0, blocksize);
   for (i = 0; i < blocknumbers - 1; i++)
     {

grub-core/disk/alpha/srm/srmdisk.c

@@ -0,0 +1,240 @@
+/* ofdisk.c - Open Firmware disk access.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2004,2006,2007,2008,2009,2011  Free Software Foundation, Inc.
+ *
+ *  GRUB 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/misc.h>
+#include <grub/disk.h>
+#include <grub/mm.h>
+#include <grub/alpha/srm/srm.h>
+
+static grub_srm_fileno_t last_handle = 0;
+static char *last_path = NULL;
+
+static int lnum = 0;
+
+struct srmdisk_hash_ent
+{
+  char *devpath;
+  int num;
+  struct srmdisk_hash_ent *next;
+};
+
+#define SRMDISK_HASH_SZ	8
+static struct srmdisk_hash_ent *srmdisk_hash[SRMDISK_HASH_SZ];
+
+static int
+srmdisk_hash_fn (const char *devpath)
+{
+  int hash = 0;
+  while (*devpath)
+    hash ^= *devpath++;
+  return (hash & (SRMDISK_HASH_SZ - 1));
+}
+
+static struct srmdisk_hash_ent *
+srmdisk_hash_find (const char *devpath)
+{
+  struct srmdisk_hash_ent *p = srmdisk_hash[srmdisk_hash_fn (devpath)];
+
+  while (p)
+    {
+      if (!grub_strcmp (p->devpath, devpath))
+	break;
+      p = p->next;
+    }
+  return p;
+}
+
+static struct srmdisk_hash_ent *
+srmdisk_hash_add (char *devpath)
+{
+  struct srmdisk_hash_ent *p;
+  struct srmdisk_hash_ent **head = &srmdisk_hash[srmdisk_hash_fn(devpath)];
+
+  p = grub_malloc (sizeof (*p));
+  if (!p)
+    return NULL;
+
+  p->devpath = devpath;
+  p->next = *head;
+  p->num = lnum++;
+  *head = p;
+  return p;
+}
+
+
+static int
+grub_srmdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
+		      grub_disk_pull_t pull)
+{
+  (void) hook;
+  (void) pull;
+  (void) hook_data;
+  return 0;
+}
+
+static grub_err_t
+reopen (const char *name)
+{
+  grub_uint64_t r;
+
+  if (last_path && grub_strcmp (last_path, name) == 0)
+    {
+      grub_dprintf ("srmdisk", "using already opened %s\n", name);
+      return GRUB_ERR_NONE;
+    }
+  if (last_path)
+    {
+      grub_alpha_srm_dispatch (GRUB_ALPHA_SRM_CLOSE, last_handle);
+      grub_free (last_path);
+      last_path = NULL;
+      last_handle = 0;
+    }
+
+  grub_dprintf ("srmdisk", "opening %s\n", name);
+  r = grub_alpha_srm_dispatch (GRUB_ALPHA_SRM_OPEN, name, grub_strlen (name));
+  grub_printf ("<%lx>", r);
+  while (1);
+  if (r & (1ULL << 63))
+    {
+      grub_dprintf ("srmdisk", "couldn't open %s\n", name);
+      return grub_error (GRUB_ERR_IO, "couldn't open %s", name);
+    }
+  last_path = grub_strdup (name);
+  if (!last_path)
+    return grub_errno;
+  last_handle = r & 0xffffffff;
+  grub_dprintf ("srmdisk", "opened %s\n", name);
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_srmdisk_open (const char *name, grub_disk_t disk)
+{
+  char *fullname;
+  grub_err_t err;
+  struct srmdisk_hash_ent *hash;
+
+  if (grub_memcmp (name, "srm/", 4) != 0)
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not srm device");
+  fullname = grub_strdup (name + 4);
+  if (!fullname)
+    return grub_errno;
+  disk->data = fullname;
+  grub_dprintf ("srmdisk", "opening %s\n", fullname);
+
+  hash = srmdisk_hash_find (fullname);
+  if (!hash)
+    hash = srmdisk_hash_add (fullname);
+  if (!hash)
+    return grub_errno;
+
+  err = reopen (fullname);
+  if (err)
+    return err;
+
+  {
+    grub_uint64_t res = 0;
+    int i;
+
+    /* FIXME: findout the block size.  */
+    for (i = 31; i >= 0; i--)
+      {
+	char buf[512];
+	grub_dprintf ("srmdisk",
+		      "seek to 0x%" PRIxGRUB_UINT64_T "\n",
+		      res | (1UL << i));
+	if (grub_alpha_srm_dispatch (GRUB_ALPHA_SRM_READ, last_handle, 512,
+				     buf, res | (1ULL << i)) & (1ULL << 63))
+	    continue;
+	  res |= (1ULL << i);
+      }
+    grub_dprintf ("srmdisk",
+		  "determined disk size 0x%" PRIxGRUB_UINT64_T "\n", res);
+    disk->total_sectors = res;
+  }
+
+  disk->id = hash->num;
+  return GRUB_ERR_NONE;
+}
+
+static void
+grub_srmdisk_close (grub_disk_t disk)
+{
+  grub_free (disk->data);
+}
+
+static grub_err_t
+grub_srmdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
+		   grub_size_t size, char *buf)
+{
+  grub_err_t err;
+
+  err = reopen (disk->data);
+  if (err)
+    return err;
+
+  /* FIXME: handle incomplete read.  */
+  if (grub_alpha_srm_dispatch (GRUB_ALPHA_SRM_READ, last_handle, 
+			       size << 9,
+			       buf, sector) & (1ULL << 63))
+	return grub_error (GRUB_ERR_READ_ERROR, "read failed");
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_srmdisk_write (grub_disk_t disk __attribute ((unused)),
+		   grub_disk_addr_t sector __attribute ((unused)),
+		   grub_size_t size __attribute ((unused)),
+		   const char *buf __attribute ((unused)))
+{
+  return GRUB_ERR_NOT_IMPLEMENTED_YET;
+}
+
+static struct grub_disk_dev grub_srmdisk_dev =
+  {
+    .name = "srmdisk",
+    .id = GRUB_DISK_DEVICE_SRMDISK_ID,
+    .iterate = grub_srmdisk_iterate,
+    .open = grub_srmdisk_open,
+    .close = grub_srmdisk_close,
+    .read = grub_srmdisk_read,
+    .write = grub_srmdisk_write,
+    .next = 0
+  };
+
+void
+grub_srmdisk_init (void)
+{
+  grub_disk_dev_register (&grub_srmdisk_dev);
+}
+
+void
+grub_srmdisk_fini (void)
+{
+  if (last_path)
+    {
+      grub_alpha_srm_dispatch (GRUB_ALPHA_SRM_CLOSE, last_handle);
+      grub_free (last_path);
+      last_path = NULL;
+      last_handle = 0;
+    }
+
+  grub_disk_dev_unregister (&grub_srmdisk_dev);
+}

grub-core/disk/alpha/srm/srmdisk.txt

@@ -0,0 +1 @@
+SCSI 0 1004 0 2 200 0 0

grub-core/disk/cryptodisk.c

@@ -51,7 +51,7 @@ static inline int GF_PER_SECTOR (const struct grub_cryptodisk *dev)
 }
 
 static grub_cryptodisk_t cryptodisk_list = NULL;
-static grub_uint8_t last_cryptodisk_id = 0;
+static grub_uint8_t n = 0;
 
 static void
 gf_mul_x (grub_uint8_t *g)
@@ -109,9 +109,7 @@ grub_crypto_pcbc_decrypt (grub_crypto_cipher_handle_t cipher,
 			 void *iv)
 {
   grub_uint8_t *inptr, *outptr, *end;
-  grub_uint8_t ivt[GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE];
-  if (cipher->cipher->blocksize > GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE)
-    return GPG_ERR_INV_ARG;
+  grub_uint8_t ivt[cipher->cipher->blocksize];
   if (!cipher->cipher->decrypt)
     return GPG_ERR_NOT_SUPPORTED;
   if (size % cipher->cipher->blocksize != 0)
@@ -134,9 +132,7 @@ grub_crypto_pcbc_encrypt (grub_crypto_cipher_handle_t cipher,
 			  void *iv)
 {
   grub_uint8_t *inptr, *outptr, *end;
-  grub_uint8_t ivt[GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE];
-  if (cipher->cipher->blocksize > GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE)
-    return GPG_ERR_INV_ARG;
+  grub_uint8_t ivt[cipher->cipher->blocksize];
   if (!cipher->cipher->decrypt)
     return GPG_ERR_NOT_SUPPORTED;
   if (size % cipher->cipher->blocksize != 0)
@@ -222,9 +218,6 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
   grub_size_t i;
   gcry_err_code_t err;
 
-  if (dev->cipher->cipher->blocksize > GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE)
-    return GPG_ERR_INV_ARG;
-
   /* The only mode without IV.  */
   if (dev->mode == GRUB_CRYPTODISK_MODE_ECB && !dev->rekey)
     return (do_encrypt ? grub_crypto_ecb_encrypt (dev->cipher, data, data, len)
@@ -235,7 +228,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
       grub_size_t sz = ((dev->cipher->cipher->blocksize
 			 + sizeof (grub_uint32_t) - 1)
 			/ sizeof (grub_uint32_t));
-      grub_uint32_t iv[(GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE + 3) / 4];
+      grub_uint32_t iv[sz];
 
       if (dev->rekey)
 	{
@@ -249,7 +242,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	    }
 	}
 
-      grub_memset (iv, 0, sizeof (iv));
+      grub_memset (iv, 0, sz * sizeof (iv[0]));
       switch (dev->mode_iv)
 	{
 	case GRUB_CRYPTODISK_MODE_IV_NULL:
@@ -257,11 +250,9 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64_HASH:
 	  {
 	    grub_uint64_t tmp;
-	    void *ctx;
+	    GRUB_PROPERLY_ALIGNED_ARRAY (ctx, dev->iv_hash->contextsize);
 
-	    ctx = grub_zalloc (dev->iv_hash->contextsize);
-	    if (!ctx)
-	      return GPG_ERR_OUT_OF_MEMORY;
+	    grub_memset (ctx, 0, sizeof (ctx));
 
 	    tmp = grub_cpu_to_le64 (sector << dev->log_sector_size);
 	    dev->iv_hash->init (ctx);
@@ -270,7 +261,6 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	    dev->iv_hash->final (ctx);
 
 	    grub_memcpy (iv, dev->iv_hash->read (ctx), sizeof (iv));
-	    grub_free (ctx);
 	  }
 	  break;
 	case GRUB_CRYPTODISK_MODE_IV_PLAIN64:
@@ -417,9 +407,7 @@ grub_cryptodisk_setkey (grub_cryptodisk_t dev, grub_uint8_t *key, grub_size_t ke
   if (dev->mode_iv == GRUB_CRYPTODISK_MODE_IV_ESSIV)
     {
       grub_size_t essiv_keysize = dev->essiv_hash->mdlen;
-      grub_uint8_t hashed_key[GRUB_CRYPTO_MAX_MDLEN];
-      if (essiv_keysize > GRUB_CRYPTO_MAX_MDLEN)
-	return GPG_ERR_INV_ARG;
+      grub_uint8_t hashed_key[essiv_keysize];
 
       grub_crypto_hash (dev->essiv_hash, hashed_key, key, keysize);
       err = grub_crypto_cipher_set_key (dev->essiv_cipher,
@@ -707,7 +695,7 @@ grub_cryptodisk_insert (grub_cryptodisk_t newdev, const char *name,
       return grub_errno;
     }
 
-  newdev->id = last_cryptodisk_id++;
+  newdev->id = n++;
   newdev->source_id = source->id;
   newdev->source_dev_id = source->dev->id;
   newdev->next = cryptodisk_list;
@@ -753,7 +741,7 @@ grub_cryptodisk_cheat_insert (grub_cryptodisk_t newdev, const char *name,
   newdev->cheat_fd = GRUB_UTIL_FD_INVALID;
   newdev->source_id = source->id;
   newdev->source_dev_id = source->dev->id;
-  newdev->id = last_cryptodisk_id++;
+  newdev->id = n++;
   newdev->next = cryptodisk_list;
   cryptodisk_list = newdev;
 
@@ -1011,14 +999,12 @@ hex (grub_uint8_t val)
 
 /* Open a file named NAME and initialize FILE.  */
 static char *
-luks_script_get (grub_size_t *sz)
+luks_script_get (void)
 {
   grub_cryptodisk_t i;
   grub_size_t size = 0;
   char *ptr, *ret;
 
-  *sz = 0;
-
   for (i = cryptodisk_list; i != NULL; i = i->next)
     if (grub_strcmp (i->modname, "luks") == 0)
       {
@@ -1100,7 +1086,6 @@ luks_script_get (grub_size_t *sz)
 	*ptr++ = '\n';
       }
   *ptr = '\0';
-  *sz = ptr - ret;
   return ret;
 }
 

grub-core/disk/diskfilter.c

@@ -934,7 +934,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
     case 4:
     case 5:
     case 6:
-      totsize = (nmemb - ((unsigned) level / 3U)) * disk_size;
+      totsize = (nmemb - level / 3) * disk_size;
       break;
 
     default:
@@ -1057,8 +1057,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
 		(unsigned long long) grub_disk_get_size (disk),
 		array->name, diskfilter->name);
 #ifdef GRUB_UTIL
-  grub_util_info ("Inserting %s (+%" GRUB_HOST_PRIuLONG_LONG ",%"
-		  GRUB_HOST_PRIuLONG_LONG ") into %s (%s)\n", disk->name,
+  grub_util_info ("Inserting %s (+%lld,%lld) into %s (%s)\n", disk->name,
 		  (unsigned long long) grub_partition_get_start (disk->partition),
 		  (unsigned long long) grub_disk_get_size (disk),
 		  array->name, diskfilter->name);

grub-core/disk/dmraid_nvidia.c

@@ -88,7 +88,7 @@ struct grub_nv_super
   char prodrev[NV_PRODREV_LEN];	/* 0x2C - 0x2F Array product revision */
   grub_uint32_t unit_flags;	/* 0x30 - 0x33 Flags for this disk */
   struct grub_nv_array array;	/* Array information */
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static struct grub_diskfilter_vg *
 grub_dmraid_nv_detect (grub_disk_t disk,

grub-core/disk/efi/efidisk.c

@@ -157,7 +157,8 @@ find_parent_device (struct grub_efidisk_data *devices,
   ldp = find_last_device_path (dp);
   ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
   ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-  ldp->length = sizeof (*ldp);
+  ldp->length[0] = sizeof (*ldp);
+  ldp->length[1] = 0;
 
   for (parent = devices; parent; parent = parent->next)
     {
@@ -187,7 +188,8 @@ is_child (struct grub_efidisk_data *child,
   ldp = find_last_device_path (dp);
   ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
   ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-  ldp->length = sizeof (*ldp);
+  ldp->length[0] = sizeof (*ldp);
+  ldp->length[1] = 0;
 
   ret = (grub_efi_compare_device_paths (dp, parent->device_path) == 0);
   grub_free (dp);
@@ -333,21 +335,6 @@ name_devices (struct grub_efidisk_data *devices)
       if (! dp)
 	continue;
 
-      /* Ghosts proudly presented by Apple.  */
-      if (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE
-	  && GRUB_EFI_DEVICE_PATH_SUBTYPE (dp)
-	  == GRUB_EFI_VENDOR_MEDIA_DEVICE_PATH_SUBTYPE)
-	{
-	  grub_efi_vendor_device_path_t *vendor = (grub_efi_vendor_device_path_t *) dp;
-	  const struct grub_efi_guid apple = GRUB_EFI_VENDOR_APPLE_GUID;
-
-	  if (vendor->header.length == sizeof (*vendor)
-	      && grub_memcmp (&vendor->vendor_guid, &apple,
-			      sizeof (vendor->vendor_guid)) == 0
-	      && find_parent_device (devices, d))
-	    continue;
-	}
-
       m = d->block_io->media;
       if (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_ACPI_DEVICE_PATH_TYPE
 	  && GRUB_EFI_DEVICE_PATH_SUBTYPE (dp)
@@ -669,7 +656,6 @@ grub_efidisk_get_device_handle (grub_disk_t disk)
 
     case 'h':
       /* If this is the whole disk, just return its own data.  */
-      grub_printf ("parent handle = %p\n", d->handle);
       if (! disk->partition)
 	return d->handle;
 
@@ -680,33 +666,22 @@ grub_efidisk_get_device_handle (grub_disk_t disk)
 	struct grub_efidisk_data *c;
 
 	devices = make_devices ();
-	grub_efi_print_device_path (d->device_path);
-	for (c = devices; c; c = c->next)
+	FOR_CHILDREN (c, devices)
 	  {
-	    grub_efi_hard_drive_device_path_t *hd;
+	    grub_efi_hard_drive_device_path_t hd;
 
-	    hd = (grub_efi_hard_drive_device_path_t *) c->last_device_path;
+	    grub_memcpy (&hd, c->last_device_path, sizeof (hd));
 
-	    grub_efi_print_device_path (c->device_path);
-	    grub_printf ("part %d = %x, %x, %x, %x, %x, %x\n",
-			 is_child (c, d),
-			 (int) GRUB_EFI_DEVICE_PATH_TYPE (c->last_device_path),
-			 (int) GRUB_EFI_DEVICE_PATH_SUBTYPE (c->last_device_path),
-			 (int) hd->partition_start, (int) hd->partition_size,
-			 (int) grub_partition_get_start (disk->partition),
-			 (int) grub_partition_get_len (disk->partition));
-
-	    if (is_child (c, d)
-		&& (GRUB_EFI_DEVICE_PATH_TYPE (c->last_device_path)
+	    if ((GRUB_EFI_DEVICE_PATH_TYPE (c->last_device_path)
 		 == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE)
 		&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (c->last_device_path)
 		    == GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE)
 		&& (grub_partition_get_start (disk->partition) 
-		    == (hd->partition_start << (disk->log_sector_size
-						- GRUB_DISK_SECTOR_BITS)))
+		    == (hd.partition_start << (disk->log_sector_size
+					       - GRUB_DISK_SECTOR_BITS)))
 		&& (grub_partition_get_len (disk->partition)
-		    == (hd->partition_size << (disk->log_sector_size
-					       - GRUB_DISK_SECTOR_BITS))))
+		    == (hd.partition_size << (disk->log_sector_size
+					      - GRUB_DISK_SECTOR_BITS))))
 	      {
 		handle = c->handle;
 		break;
@@ -772,7 +747,7 @@ get_diskname_from_path (const grub_efi_device_path_t *path,
 struct grub_efidisk_get_device_name_ctx
 {
   char *partition_name;
-  grub_efi_hard_drive_device_path_t *hd;
+  grub_efi_hard_drive_device_path_t hd;
 };
 
 /* Helper for grub_efidisk_get_device_name.
@@ -784,11 +759,11 @@ grub_efidisk_get_device_name_iter (grub_disk_t disk,
   struct grub_efidisk_get_device_name_ctx *ctx = data;
 
   if (grub_partition_get_start (part)
-      == (ctx->hd->partition_start << (disk->log_sector_size
-				       - GRUB_DISK_SECTOR_BITS))
+      == (ctx->hd.partition_start << (disk->log_sector_size
+				      - GRUB_DISK_SECTOR_BITS))
       && grub_partition_get_len (part)
-      == (ctx->hd->partition_size << (disk->log_sector_size
-				      - GRUB_DISK_SECTOR_BITS)))
+      == (ctx->hd.partition_size << (disk->log_sector_size
+				     - GRUB_DISK_SECTOR_BITS)))
     {
       ctx->partition_name = grub_partition_get_name (part);
       return 1;
@@ -841,7 +816,8 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 
 	  dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
 	  dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-	  dup_ldp->length = sizeof (*dup_ldp);
+	  dup_ldp->length[0] = sizeof (*dup_ldp);
+	  dup_ldp->length[1] = 0;
 	}
 
       if (!get_diskname_from_path (dup_dp, device_name))
@@ -858,10 +834,10 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 
       /* Find a partition which matches the hard drive device path.  */
       ctx.partition_name = NULL;
-      ctx.hd = (grub_efi_hard_drive_device_path_t *) ldp;
-      if (ctx.hd->partition_start == 0
-	  && (ctx.hd->partition_size << (parent->log_sector_size
-					 - GRUB_DISK_SECTOR_BITS))
+      grub_memcpy (&ctx.hd, ldp, sizeof (ctx.hd));
+      if (ctx.hd.partition_start == 0
+	  && (ctx.hd.partition_size << (parent->log_sector_size
+					- GRUB_DISK_SECTOR_BITS))
 	  == grub_disk_get_size (parent))
 	{
 	  dev_name = grub_strdup (parent->name);

grub-core/disk/geli.c

@@ -95,7 +95,7 @@ struct grub_geli_key
   grub_uint8_t iv_key[64];
   grub_uint8_t cipher_key[64];
   grub_uint8_t hmac[64];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_geli_phdr
 {
@@ -111,7 +111,7 @@ struct grub_geli_phdr
   grub_uint32_t niter;
   grub_uint8_t salt[64];
   struct grub_geli_key keys[2];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 enum
   {
@@ -144,12 +144,9 @@ geli_rekey (struct grub_cryptodisk *dev, grub_uint64_t zoneno)
   const struct {
     char magic[4];
     grub_uint64_t zone;
-  } GRUB_PACKED tohash
+  } __attribute__ ((packed)) tohash
       = { {'e', 'k', 'e', 'y'}, grub_cpu_to_le64 (zoneno) };
-  GRUB_PROPERLY_ALIGNED_ARRAY (key, GRUB_CRYPTO_MAX_MDLEN);
-
-  if (dev->hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
-    return GPG_ERR_INV_ARG;
+  GRUB_PROPERLY_ALIGNED_ARRAY (key, dev->hash->mdlen);
 
   grub_dprintf ("geli", "rekeying %" PRIuGRUB_UINT64_T " keysize=%d\n",
 		zoneno, dev->rekey_derived_size);
@@ -166,13 +163,11 @@ static inline gcry_err_code_t
 make_uuid (const struct grub_geli_phdr *header,
 	   char *uuid)
 {
-  grub_uint8_t uuidbin[GRUB_CRYPTODISK_MAX_UUID_LENGTH];
+  grub_uint8_t uuidbin[GRUB_MD_SHA256->mdlen];
   gcry_err_code_t err;
   grub_uint8_t *iptr;
   char *optr;
 
-  if (2 * GRUB_MD_SHA256->mdlen + 1 > GRUB_CRYPTODISK_MAX_UUID_LENGTH)
-    return GPG_ERR_TOO_LARGE;
   err = grub_crypto_hmac_buffer (GRUB_MD_SHA256,
 				 header->salt, sizeof (header->salt),
 				 "uuid", sizeof ("uuid") - 1, uuidbin);
@@ -180,7 +175,7 @@ make_uuid (const struct grub_geli_phdr *header,
     return err;
 
   optr = uuid;
-  for (iptr = uuidbin; iptr < &uuidbin[GRUB_MD_SHA256->mdlen]; iptr++)
+  for (iptr = uuidbin; iptr < &uuidbin[ARRAY_SIZE (uuidbin)]; iptr++)
     {
       grub_snprintf (optr, 3, "%02x", *iptr);
       optr += 2;
@@ -247,13 +242,10 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
   const struct gcry_cipher_spec *ciph;
   const char *ciphername = NULL;
   gcry_err_code_t gcry_err;
-  char uuid[GRUB_CRYPTODISK_MAX_UUID_LENGTH];
+  char uuid[GRUB_MD_SHA256->mdlen * 2 + 1];
   grub_disk_addr_t sector;
   grub_err_t err;
 
-  if (2 * GRUB_MD_SHA256->mdlen + 1 > GRUB_CRYPTODISK_MAX_UUID_LENGTH)
-    return NULL;
-
   sector = grub_disk_get_size (disk);
   if (sector == GRUB_DISK_SIZE_UNKNOWN || sector == 0)
     return NULL;
@@ -387,10 +379,10 @@ static grub_err_t
 recover_key (grub_disk_t source, grub_cryptodisk_t dev)
 {
   grub_size_t keysize;
-  grub_uint8_t digest[GRUB_CRYPTO_MAX_MDLEN];
-  grub_uint8_t geomkey[GRUB_CRYPTO_MAX_MDLEN];
-  grub_uint8_t verify_key[GRUB_CRYPTO_MAX_MDLEN];
-  grub_uint8_t zero[GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE];
+  grub_uint8_t digest[dev->hash->mdlen];
+  grub_uint8_t geomkey[dev->hash->mdlen];
+  grub_uint8_t verify_key[dev->hash->mdlen];
+  grub_uint8_t zero[dev->cipher->cipher->blocksize];
   char passphrase[MAX_PASSPHRASE] = "";
   unsigned i;
   gcry_err_code_t gcry_err;
@@ -399,12 +391,6 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev)
   grub_disk_addr_t sector;
   grub_err_t err;
 
-  if (dev->cipher->cipher->blocksize > GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE)
-    return grub_error (GRUB_ERR_BUG, "cipher block is too long");
-
-  if (dev->hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
-    return grub_error (GRUB_ERR_BUG, "mdlen is too long");
-
   sector = grub_disk_get_size (source);
   if (sector == GRUB_DISK_SIZE_UNKNOWN || sector == 0)
     return grub_error (GRUB_ERR_BUG, "not a geli");
@@ -466,12 +452,12 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev)
     }
 
   gcry_err = grub_crypto_hmac_buffer (dev->hash, geomkey,
-				      dev->hash->mdlen, "\1", 1, digest);
+				      sizeof (geomkey), "\1", 1, digest);
   if (gcry_err)
     return grub_crypto_gcry_error (gcry_err);
 
   gcry_err = grub_crypto_hmac_buffer (dev->hash, geomkey,
-				      dev->hash->mdlen, "\0", 1, verify_key);
+				      sizeof (geomkey), "\0", 1, verify_key);
   if (gcry_err)
     return grub_crypto_gcry_error (gcry_err);
 
@@ -481,7 +467,7 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev)
   for (i = 0; i < ARRAY_SIZE (header.keys); i++)
     {
       struct grub_geli_key candidate_key;
-      grub_uint8_t key_hmac[GRUB_CRYPTO_MAX_MDLEN];
+      grub_uint8_t key_hmac[dev->hash->mdlen];
 
       /* Check if keyslot is enabled.  */
       if (! (header.keys_used & (1 << i)))
@@ -502,7 +488,7 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev)
 	return grub_crypto_gcry_error (gcry_err);
 
       gcry_err = grub_crypto_hmac_buffer (dev->hash, verify_key,
-					  dev->hash->mdlen,
+					  sizeof (verify_key), 
 					  &candidate_key,
 					  (sizeof (candidate_key)
 					   - sizeof (candidate_key.hmac)),

grub-core/disk/host.c

@@ -49,7 +49,7 @@ grub_host_open (const char *name, grub_disk_t disk)
       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a host disk");
 
   disk->total_sectors = 0;
-  disk->id = 0;
+  disk->id = (unsigned long) "host";
 
   disk->data = 0;
 

grub-core/disk/i386/pc/biosdisk.c

@@ -426,10 +426,6 @@ grub_biosdisk_open (const char *name, grub_disk_t disk)
   disk->total_sectors = total_sectors;
   /* Limit the max to 0x7f because of Phoenix EDD.  */
   disk->max_agglomerate = 0x7f >> GRUB_DISK_CACHE_BITS;
-  COMPILE_TIME_ASSERT ((0x7f >> GRUB_DISK_CACHE_BITS
-			<< (GRUB_DISK_SECTOR_BITS + GRUB_DISK_CACHE_BITS))
-		       + sizeof (struct grub_biosdisk_dap)
-		       < GRUB_MEMORY_MACHINE_SCRATCH_SIZE);
 
   disk->data = data;
 

grub-core/disk/ieee1275/ofdisk.c

@@ -31,14 +31,11 @@ static grub_ieee1275_ihandle_t last_ihandle;
 struct ofdisk_hash_ent
 {
   char *devpath;
-  char *open_path;
-  char *grub_devpath;
   int is_boot;
   int is_cdrom;
   /* Pointer to shortest available name on nodes representing canonical names,
      otherwise NULL.  */
   const char *shortest;
-  const char *grub_shortest;
   struct ofdisk_hash_ent *next;
 };
 
@@ -73,50 +70,12 @@ ofdisk_hash_add_real (char *devpath)
 {
   struct ofdisk_hash_ent *p;
   struct ofdisk_hash_ent **head = &ofdisk_hash[ofdisk_hash_fn(devpath)];
-  const char *iptr;
-  char *optr;
 
   p = grub_zalloc (sizeof (*p));
   if (!p)
     return NULL;
 
   p->devpath = devpath;
-
-  p->grub_devpath = grub_malloc (sizeof ("ieee1275/")
-				 + 2 * grub_strlen (p->devpath));
-
-  if (!p->grub_devpath)
-    {
-      grub_free (p);
-      return NULL;
-    }
-
-  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
-    {
-      p->open_path = grub_malloc (grub_strlen (p->devpath) + 3);
-      if (!p->open_path)
-	{
-	  grub_free (p->grub_devpath);
-	  grub_free (p);
-	  return NULL;
-	}
-      optr = grub_stpcpy (p->open_path, p->devpath);
-      *optr++ = ':';
-      *optr++ = '0';
-      *optr = '\0';
-    }
-  else
-    p->open_path = p->devpath;
-
-  optr = grub_stpcpy (p->grub_devpath, "ieee1275/");
-  for (iptr = p->devpath; *iptr; )
-    {
-      if (*iptr == ',')
-	*optr++ = '\\';
-      *optr++ = *iptr++;
-    }
-  *optr = 0;
-
   p->next = *head;
   *head = p;
   return p;
@@ -145,8 +104,7 @@ ofdisk_hash_add (char *devpath, char *curcan)
 
   if (!curcan)
     {
-      p->shortest = p->devpath;
-      p->grub_shortest = p->grub_devpath;
+      p->shortest = devpath;
       if (check_string_cdrom (devpath))
 	p->is_cdrom = 1;  
       return p;
@@ -167,10 +125,7 @@ ofdisk_hash_add (char *devpath, char *curcan)
     {
       if (!pcan->shortest
 	  || grub_strlen (pcan->shortest) > grub_strlen (devpath))
-	{
-	  pcan->shortest = p->devpath;
-	  pcan->grub_shortest = p->grub_devpath;
-	}
+	pcan->shortest = devpath;
     }
 
   return p;
@@ -333,8 +288,21 @@ grub_ofdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
 	  if (!ent->is_boot && ent->is_cdrom)
 	    continue;
 
-	  if (hook (ent->grub_shortest, hook_data))
-	    return 1;
+	  {
+	    char buffer[sizeof ("ieee1275/") + 2 * grub_strlen (ent->shortest)];
+	    const char *iptr;
+	    char *optr;
+	    optr = grub_stpcpy (buffer, "ieee1275/");
+	    for (iptr = ent->shortest; *iptr; )
+	      {
+		if (*iptr == ',')
+		  *optr++ = '\\';
+		*optr++ = *iptr++;
+	      }
+	    *optr = 0;
+	    if (hook (buffer, hook_data))
+	      return 1;
+	  }
 	}
     }	  
   return 0;
@@ -428,7 +396,7 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
     if (!op)
       return grub_errno;
     disk->id = (unsigned long) op;
-    disk->data = op->open_path;
+    disk->data = op->devpath;
   }
 
   return 0;
@@ -460,7 +428,20 @@ grub_ofdisk_prepare (grub_disk_t disk, grub_disk_addr_t sector)
       last_ihandle = 0;
       last_devpath = NULL;
 
-      grub_ieee1275_open (disk->data, &last_ihandle);
+      if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
+	{
+	  char name2[grub_strlen (disk->data) + 3];
+	  char *p;
+	  
+	  grub_strcpy (name2, disk->data);
+	  p = name2 + grub_strlen (name2);
+	  *p++ = ':';
+	  *p++ = '0';
+	  *p = 0;
+	  grub_ieee1275_open (name2, &last_ihandle);
+	}
+      else
+	grub_ieee1275_open (disk->data, &last_ihandle);
       if (! last_ihandle)
 	return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
       last_devpath = disk->data;      

grub-core/disk/ldm.c

@@ -49,7 +49,7 @@ struct grub_ldm_vblk {
   grub_uint8_t type;
   grub_uint32_t unused2;
   grub_uint8_t dynamic[104];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 #define LDM_VBLK_MAGIC "VBLK"
 
 enum
@@ -83,7 +83,7 @@ struct grub_ldm_label
   grub_uint64_t pv_size;
   grub_uint64_t config_start;
   grub_uint64_t config_size;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 
 #define LDM_MAGIC "PRIVHEAD"
@@ -1012,7 +1012,7 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
 			      usable for bootloaders (called generically
 			      "embedding zone") and this operation is
 			      called "embedding".  */
-			   N_("your LDM Embedding Partition is too small;"
+			   N_("your LDM embedding Partition is too small;"
 			      " embedding won't be possible"));
       *nsectors = lv->size;
       if (*nsectors > max_nsectors)

grub-core/disk/loopback.c

@@ -32,11 +32,9 @@ struct grub_loopback
   char *devname;
   grub_file_t file;
   struct grub_loopback *next;
-  unsigned long id;
 };
 
 static struct grub_loopback *loopback_list;
-static unsigned long last_id = 0;
 
 static const struct grub_arg_option options[] =
   {
@@ -122,7 +120,6 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
     }
 
   newdev->file = file;
-  newdev->id = last_id++;
 
   /* Add the new entry to the list.  */
   newdev->next = loopback_list;
@@ -174,7 +171,7 @@ grub_loopback_open (const char *name, grub_disk_t disk)
   disk->max_agglomerate = 1 << (29 - GRUB_DISK_SECTOR_BITS
 				- GRUB_DISK_CACHE_BITS);
 
-  disk->id = dev->id;
+  disk->id = (unsigned long) dev;
 
   disk->data = dev;
 

grub-core/disk/luks.c

@@ -56,7 +56,7 @@ struct grub_luks_phdr
     grub_uint32_t keyMaterialOffset;
     grub_uint32_t stripes;
   } keyblock[8];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 typedef struct grub_luks_phdr *grub_luks_phdr_t;
 
@@ -316,8 +316,6 @@ luks_recover_key (grub_disk_t source,
 
   grub_puts_ (N_("Attempting to decrypt master key..."));
   keysize = grub_be_to_cpu32 (header.keyBytes);
-  if (keysize > GRUB_CRYPTODISK_MAX_KEYLEN)
-    return grub_error (GRUB_ERR_BAD_FS, "key is too long");
 
   for (i = 0; i < ARRAY_SIZE (header.keyblock); i++)
     if (grub_be_to_cpu32 (header.keyblock[i].active) == LUKS_KEY_ENABLED
@@ -346,8 +344,8 @@ luks_recover_key (grub_disk_t source,
   for (i = 0; i < ARRAY_SIZE (header.keyblock); i++)
     {
       gcry_err_code_t gcry_err;
-      grub_uint8_t candidate_key[GRUB_CRYPTODISK_MAX_KEYLEN];
-      grub_uint8_t digest[GRUB_CRYPTODISK_MAX_KEYLEN];
+      grub_uint8_t candidate_key[keysize];
+      grub_uint8_t digest[keysize];
 
       /* Check if keyslot is enabled.  */
       if (grub_be_to_cpu32 (header.keyblock[i].active) != LUKS_KEY_ENABLED)

grub-core/disk/lvm.c

@@ -65,7 +65,7 @@ grub_lvm_checkvalue (char **p, char *str, char *tmpl)
 static int
 grub_lvm_check_flag (char *p, const char *str, const char *flag)
 {
-  grub_size_t len_str = grub_strlen (str), len_flag = grub_strlen (flag);
+  int len_str = grub_strlen (str), len_flag = grub_strlen (flag);
   while (1)
     {
       char *q;
@@ -111,8 +111,7 @@ grub_lvm_detect (grub_disk_t disk,
   struct grub_lvm_disk_locn *dlocn;
   struct grub_lvm_mda_header *mdah;
   struct grub_lvm_raw_locn *rlocn;
-  unsigned int i, j;
-  grub_size_t vgname_len;
+  unsigned int i, j, vgname_len;
   struct grub_diskfilter_vg *vg;
   struct grub_diskfilter_pv *pv;
 
@@ -274,7 +273,7 @@ grub_lvm_detect (grub_disk_t disk,
 	  /* Add all the pvs to the volume group. */
 	  while (1)
 	    {
-	      grub_ssize_t s;
+	      int s;
 	      while (grub_isspace (*p))
 		p++;
 
@@ -341,7 +340,7 @@ grub_lvm_detect (grub_disk_t disk,
 	  /* And add all the lvs to the volume group. */
 	  while (1)
 	    {
-	      grub_ssize_t s;
+	      int s;
 	      int skip_lv = 0;
 	      struct grub_diskfilter_lv *lv;
 	      struct grub_diskfilter_segment *seg;

grub-core/disk/mdraid1x_linux.c

@@ -97,7 +97,7 @@ struct grub_raid_super_1x
    */
   grub_uint16_t dev_roles[0];	/* Role in array, or 0xffff for a spare, or 0xfffe for faulty.  */
 };
-/* Could be GRUB_PACKED, but since all members in this struct
+/* Could be __attribute__ ((packed)), but since all members in this struct
    are already appropriately aligned, we can omit this and avoid suboptimal
    assembly in some cases.  */
 

grub-core/disk/mdraid_linux.c

@@ -175,7 +175,7 @@ struct grub_raid_super_09
    * Active descriptor
    */
   struct grub_raid_disk_09 this_disk;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static struct grub_diskfilter_vg *
 grub_mdraid_detect (grub_disk_t disk,
@@ -184,10 +184,9 @@ grub_mdraid_detect (grub_disk_t disk,
 {
   grub_disk_addr_t sector;
   grub_uint64_t size;
-  struct grub_raid_super_09 *sb = NULL;
+  struct grub_raid_super_09 sb;
   grub_uint32_t *uuid;
   grub_uint32_t level;
-  struct grub_diskfilter_vg *ret;
 
   /* The sector where the mdraid 0.90 superblock is stored, if available.  */
   size = grub_disk_get_size (disk);
@@ -196,31 +195,27 @@ grub_mdraid_detect (grub_disk_t disk,
     return NULL;
   sector = NEW_SIZE_SECTORS (size);
 
-  sb = grub_malloc (sizeof (*sb));
-  if (!sb)
+  if (grub_disk_read (disk, sector, 0, SB_BYTES, &sb))
     return NULL;
 
-  if (grub_disk_read (disk, sector, 0, SB_BYTES, sb))
-    goto fail;
-
   /* Look whether there is a mdraid 0.90 superblock.  */
-  if (sb->md_magic != grub_cpu_to_md32_compile_time (SB_MAGIC))
+  if (sb.md_magic != grub_cpu_to_md32_compile_time (SB_MAGIC))
     /* not 0.9x raid.  */
-    goto fail;
+    return NULL;
 
-  if (sb->major_version != grub_cpu_to_md32_compile_time (0)
-      || sb->minor_version != grub_cpu_to_md32_compile_time (90))
+  if (sb.major_version != grub_cpu_to_md32_compile_time (0)
+      || sb.minor_version != grub_cpu_to_md32_compile_time (90))
     /* Unsupported version.  */
-    goto fail;
+    return NULL;
 
-  /* No need for explicit check that sb->size is 0 (unspecified) since
+  /* No need for explicit check that sb.size is 0 (unspecified) since
      0 >= non-0 is false.  */
-  if (((grub_disk_addr_t) grub_md_to_cpu32 (sb->size)) * 2 >= size)
-    goto fail;
+  if (((grub_disk_addr_t) grub_md_to_cpu32 (sb.size)) * 2 >= size)
+    return NULL;
 
   /* FIXME: Check the checksum.  */
 
-  level = grub_md_to_cpu32 (sb->level);
+  level = grub_md_to_cpu32 (sb.level);
   /* Multipath.  */
   if ((int) level == -4)
     level = 1;
@@ -230,43 +225,37 @@ grub_mdraid_detect (grub_disk_t disk,
     {
       grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 		  "unsupported RAID level: %d", level);
-      goto fail;
+      return NULL;
     }
-  if (grub_md_to_cpu32 (sb->this_disk.number) == 0xffff
-      || grub_md_to_cpu32 (sb->this_disk.number) == 0xfffe)
+  if (grub_md_to_cpu32 (sb.this_disk.number) == 0xffff
+      || grub_md_to_cpu32 (sb.this_disk.number) == 0xfffe)
     /* Spares aren't implemented.  */
-    goto fail;
+    return NULL;
 
   uuid = grub_malloc (16);
   if (!uuid)
-    goto fail;
+    return NULL;
 
-  uuid[0] = grub_swap_bytes32 (sb->set_uuid0);
-  uuid[1] = grub_swap_bytes32 (sb->set_uuid1);
-  uuid[2] = grub_swap_bytes32 (sb->set_uuid2);
-  uuid[3] = grub_swap_bytes32 (sb->set_uuid3);
+  uuid[0] = grub_swap_bytes32 (sb.set_uuid0);
+  uuid[1] = grub_swap_bytes32 (sb.set_uuid1);
+  uuid[2] = grub_swap_bytes32 (sb.set_uuid2);
+  uuid[3] = grub_swap_bytes32 (sb.set_uuid3);
 
   *start_sector = 0;
 
   id->uuidlen = 0;
-  id->id = grub_md_to_cpu32 (sb->this_disk.number);
+  id->id = grub_md_to_cpu32 (sb.this_disk.number);
 
   char buf[32];
-  grub_snprintf (buf, sizeof (buf), "md%d", grub_md_to_cpu32 (sb->md_minor));
-  ret = grub_diskfilter_make_raid (16, (char *) uuid,
-				   grub_md_to_cpu32 (sb->raid_disks), buf,
-				   (sb->size) ? ((grub_disk_addr_t)
-						 grub_md_to_cpu32 (sb->size)) * 2
-				   : sector,
-				   grub_md_to_cpu32 (sb->chunk_size) >> 9,
-				   grub_md_to_cpu32 (sb->layout),
-				   level);
-  grub_free (sb);
-  return ret;
-
- fail:
-  grub_free (sb);
-  return NULL;
+  grub_snprintf (buf, sizeof (buf), "md%d", grub_md_to_cpu32 (sb.md_minor));
+  return grub_diskfilter_make_raid (16, (char *) uuid,
+				    grub_md_to_cpu32 (sb.raid_disks), buf,
+				    (sb.size) ? ((grub_disk_addr_t)
+						 grub_md_to_cpu32 (sb.size)) * 2
+				    : sector,
+				    grub_md_to_cpu32 (sb.chunk_size) >> 9,
+				    grub_md_to_cpu32 (sb.layout),
+				    level);
 }
 
 static struct grub_diskfilter grub_mdraid_dev = {

grub-core/disk/memdisk.c

@@ -47,7 +47,7 @@ grub_memdisk_open (const char *name, grub_disk_t disk)
 
   disk->total_sectors = memdisk_size / GRUB_DISK_SECTOR_SIZE;
   disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
-  disk->id = 0;
+  disk->id = (unsigned long) "mdsk";
 
   return GRUB_ERR_NONE;
 }

grub-core/disk/pata.c

@@ -402,15 +402,9 @@ grub_pata_pciinit (grub_pci_device_t dev,
 	  bar2 = grub_pci_read (addr);
 
 	  /* Check if the BARs describe an IO region.  */
-	  if ((bar1 & 1) && (bar2 & 1) && (bar1 & ~3))
+	  if ((bar1 & 1) && (bar2 & 1))
 	    {
 	      rega = bar1 & ~3;
-	      addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-	      grub_pci_write_word (addr, grub_pci_read_word (addr)
-				   | GRUB_PCI_COMMAND_IO_ENABLED
-				   | GRUB_PCI_COMMAND_MEM_ENABLED
-				   | GRUB_PCI_COMMAND_BUS_MASTER);
-
 	    }
 	}
 

grub-core/disk/raid6_recover.c

@@ -34,9 +34,9 @@ static unsigned powx_inv[256];
 static const grub_uint8_t poly = 0x1d;
 
 static void
-grub_raid_block_mulx (unsigned mul, char *buf, grub_size_t size)
+grub_raid_block_mulx (unsigned mul, char *buf, int size)
 {
-  grub_size_t i;
+  int i;
   grub_uint8_t *p;
 
   p = (grub_uint8_t *) buf;

grub-core/disk/uboot/ubootdisk.c

@@ -47,7 +47,6 @@ grub_ubootdisk_register (struct device_info *newdev)
     {
     case DT_STOR_IDE:
     case DT_STOR_SATA:
-    case DT_STOR_SCSI:
     case DT_STOR_MMC:
     case DT_STOR_USB:
       /* hd */

grub-core/disk/usbms.c

@@ -44,7 +44,7 @@ struct grub_usbms_cbw
   grub_uint8_t lun;
   grub_uint8_t length;
   grub_uint8_t cbwcb[16];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_usbms_csw
 {
@@ -52,7 +52,7 @@ struct grub_usbms_csw
   grub_uint32_t tag;
   grub_uint32_t residue;
   grub_uint8_t status;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_usbms_dev
 {
@@ -298,8 +298,6 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   grub_usb_err_t errCSW = GRUB_USB_ERR_NONE;
   int retrycnt = 3 + 1;
   
-  tag++;
-
  retry:
   retrycnt--;
   if (retrycnt == 0)
@@ -308,7 +306,7 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   /* Setup the request.  */
   grub_memset (&cbw, 0, sizeof (cbw));
   cbw.signature = grub_cpu_to_le32 (0x43425355);
-  cbw.tag = tag;
+  cbw.tag = tag++;
   cbw.transfer_length = grub_cpu_to_le32 (size);
   cbw.flags = (!read_write) << GRUB_USBMS_DIRECTION_BIT;
   cbw.lun = scsi->lun; /* In USB MS CBW are LUN bits on another place than in SCSI CDB, both should be set correctly. */
@@ -337,7 +335,7 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
 	  grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
 	  goto CheckCSW;
 	}
-      goto retry;
+      return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");
     }
 
   /* Read/write the data, (maybe) according to specification.  */

grub-core/disk/xen/xendisk.c

@@ -1,458 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/disk.h>
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/err.h>
-#include <grub/term.h>
-#include <grub/i18n.h>
-#include <grub/xen.h>
-#include <grub/time.h>
-#include <xen/io/blkif.h>
-
-struct virtdisk
-{
-  int handle;
-  char *fullname;
-  char *backend_dir;
-  char *frontend_dir;
-  struct blkif_sring *shared_page;
-  struct blkif_front_ring ring;
-  grub_xen_grant_t grant;
-  grub_xen_evtchn_t evtchn;
-  void *dma_page;
-  grub_xen_grant_t dma_grant;
-};
-
-#define xen_wmb() mb()
-#define xen_mb() mb()
-
-static struct virtdisk *virtdisks;
-static grub_size_t vdiskcnt;
-
-static int
-grub_virtdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
-		       grub_disk_pull_t pull)
-{
-  grub_size_t i;
-
-  if (pull != GRUB_DISK_PULL_NONE)
-    return 0;
-
-  for (i = 0; i < vdiskcnt; i++)
-    if (hook (virtdisks[i].fullname, hook_data))
-      return 1;
-  return 0;
-}
-
-static grub_err_t
-grub_virtdisk_open (const char *name, grub_disk_t disk)
-{
-  grub_size_t i;
-  grub_uint32_t secsize;
-  char fdir[200];
-  char *buf;
-
-  for (i = 0; i < vdiskcnt; i++)
-    if (grub_strcmp (name, virtdisks[i].fullname) == 0)
-      break;
-  if (i == vdiskcnt)
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a virtdisk");
-  disk->data = &virtdisks[i];
-  disk->id = i;
-
-  grub_snprintf (fdir, sizeof (fdir), "%s/sectors", virtdisks[i].backend_dir);
-  buf = grub_xenstore_get_file (fdir, NULL);
-  if (!buf)
-    return grub_errno;
-  disk->total_sectors = grub_strtoull (buf, 0, 10);
-  if (grub_errno)
-    return grub_errno;
-
-  grub_snprintf (fdir, sizeof (fdir), "%s/sector-size",
-		 virtdisks[i].backend_dir);
-  buf = grub_xenstore_get_file (fdir, NULL);
-  if (!buf)
-    return grub_errno;
-  secsize = grub_strtoull (buf, 0, 10);
-  if (grub_errno)
-    return grub_errno;
-
-  if ((secsize & (secsize - 1)) || !secsize || secsize < 512
-      || secsize > GRUB_XEN_PAGE_SIZE)
-    return grub_error (GRUB_ERR_IO, "unsupported sector size %d", secsize);
-
-  for (disk->log_sector_size = 0;
-       (1U << disk->log_sector_size) < secsize; disk->log_sector_size++);
-
-  disk->total_sectors >>= disk->log_sector_size - 9;
-
-  return GRUB_ERR_NONE;
-}
-
-static void
-grub_virtdisk_close (grub_disk_t disk __attribute__ ((unused)))
-{
-}
-
-static grub_err_t
-grub_virtdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
-		    grub_size_t size, char *buf)
-{
-  struct virtdisk *data = disk->data;
-
-  while (size)
-    {
-      grub_size_t cur;
-      struct blkif_request *req;
-      struct blkif_response *resp;
-      int sta = 0;
-      struct evtchn_send send;
-      cur = size;
-      if (cur > (unsigned) (GRUB_XEN_PAGE_SIZE >> disk->log_sector_size))
-	cur = GRUB_XEN_PAGE_SIZE >> disk->log_sector_size;
-      while (RING_FULL (&data->ring))
-	grub_xen_sched_op (SCHEDOP_yield, 0);
-      req = RING_GET_REQUEST (&data->ring, data->ring.req_prod_pvt);
-      req->operation = BLKIF_OP_READ;
-      req->nr_segments = 1;
-      req->handle = data->handle;
-      req->id = 0;
-      req->sector_number = sector << (disk->log_sector_size - 9);
-      req->seg[0].gref = data->dma_grant;
-      req->seg[0].first_sect = 0;
-      req->seg[0].last_sect = (cur << (disk->log_sector_size - 9)) - 1;
-      data->ring.req_prod_pvt++;
-      RING_PUSH_REQUESTS (&data->ring);
-      mb ();
-      send.port = data->evtchn;
-      grub_xen_event_channel_op (EVTCHNOP_send, &send);
-
-      while (!RING_HAS_UNCONSUMED_RESPONSES (&data->ring))
-	{
-	  grub_xen_sched_op (SCHEDOP_yield, 0);
-	  mb ();
-	}
-      while (1)
-	{
-	  int wtd;
-	  RING_FINAL_CHECK_FOR_RESPONSES (&data->ring, wtd);
-	  if (!wtd)
-	    break;
-	  resp = RING_GET_RESPONSE (&data->ring, data->ring.rsp_cons);
-	  data->ring.rsp_cons++;
-	  if (resp->status)
-	    sta = resp->status;
-	}
-      if (sta)
-	return grub_error (GRUB_ERR_IO, "read failed");
-      grub_memcpy (buf, data->dma_page, cur << disk->log_sector_size);
-      size -= cur;
-      sector += cur;
-      buf += cur << disk->log_sector_size;
-    }
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_virtdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
-		     grub_size_t size, const char *buf)
-{
-  struct virtdisk *data = disk->data;
-
-  while (size)
-    {
-      grub_size_t cur;
-      struct blkif_request *req;
-      struct blkif_response *resp;
-      int sta = 0;
-      struct evtchn_send send;
-      cur = size;
-      if (cur > (unsigned) (GRUB_XEN_PAGE_SIZE >> disk->log_sector_size))
-	cur = GRUB_XEN_PAGE_SIZE >> disk->log_sector_size;
-
-      grub_memcpy (data->dma_page, buf, cur << disk->log_sector_size);
-
-      while (RING_FULL (&data->ring))
-	grub_xen_sched_op (SCHEDOP_yield, 0);
-      req = RING_GET_REQUEST (&data->ring, data->ring.req_prod_pvt);
-      req->operation = BLKIF_OP_WRITE;
-      req->nr_segments = 1;
-      req->handle = data->handle;
-      req->id = 0;
-      req->sector_number = sector << (disk->log_sector_size - 9);
-      req->seg[0].gref = data->dma_grant;
-      req->seg[0].first_sect = 0;
-      req->seg[0].last_sect = (cur << (disk->log_sector_size - 9)) - 1;
-      data->ring.req_prod_pvt++;
-      RING_PUSH_REQUESTS (&data->ring);
-      mb ();
-      send.port = data->evtchn;
-      grub_xen_event_channel_op (EVTCHNOP_send, &send);
-
-      while (!RING_HAS_UNCONSUMED_RESPONSES (&data->ring))
-	{
-	  grub_xen_sched_op (SCHEDOP_yield, 0);
-	  mb ();
-	}
-      while (1)
-	{
-	  int wtd;
-	  RING_FINAL_CHECK_FOR_RESPONSES (&data->ring, wtd);
-	  if (!wtd)
-	    break;
-	  resp = RING_GET_RESPONSE (&data->ring, data->ring.rsp_cons);
-	  data->ring.rsp_cons++;
-	  if (resp->status)
-	    sta = resp->status;
-	}
-      if (sta)
-	return grub_error (GRUB_ERR_IO, "write failed");
-      size -= cur;
-      sector += cur;
-      buf += cur << disk->log_sector_size;
-    }
-  return GRUB_ERR_NONE;
-}
-
-static struct grub_disk_dev grub_virtdisk_dev = {
-  .name = "xen",
-  .id = GRUB_DISK_DEVICE_XEN,
-  .iterate = grub_virtdisk_iterate,
-  .open = grub_virtdisk_open,
-  .close = grub_virtdisk_close,
-  .read = grub_virtdisk_read,
-  .write = grub_virtdisk_write,
-  .next = 0
-};
-
-static int
-count (const char *dir __attribute__ ((unused)), void *data)
-{
-  grub_size_t *ctr = data;
-  (*ctr)++;
-
-  return 0;
-}
-
-static int
-fill (const char *dir, void *data)
-{
-  grub_size_t *ctr = data;
-  domid_t dom;
-  /* "dir" is just a number, at most 19 characters. */
-  char fdir[200];
-  char num[20];
-  grub_err_t err;
-  void *buf;
-  struct evtchn_alloc_unbound alloc_unbound;
-
-  /* Shouldn't happen unles some hotplug happened.  */
-  if (vdiskcnt >= *ctr)
-    return 1;
-  virtdisks[vdiskcnt].handle = grub_strtoul (dir, 0, 10);
-  if (grub_errno)
-    {
-      grub_errno = 0;
-      return 0;
-    }
-  virtdisks[vdiskcnt].fullname = 0;
-  virtdisks[vdiskcnt].backend_dir = 0;
-
-  grub_snprintf (fdir, sizeof (fdir), "device/vbd/%s/backend", dir);
-  virtdisks[vdiskcnt].backend_dir = grub_xenstore_get_file (fdir, NULL);
-  if (!virtdisks[vdiskcnt].backend_dir)
-    goto out_fail_1;
-
-  grub_snprintf (fdir, sizeof (fdir), "%s/dev",
-		 virtdisks[vdiskcnt].backend_dir);
-  buf = grub_xenstore_get_file (fdir, NULL);
-  if (!buf)
-    {
-      grub_errno = 0;
-      virtdisks[vdiskcnt].fullname = grub_xasprintf ("xenid/%s", dir);
-    }
-  else
-    {
-      virtdisks[vdiskcnt].fullname = grub_xasprintf ("xen/%s", (char *) buf);
-      grub_free (buf);
-    }
-  if (!virtdisks[vdiskcnt].fullname)
-    goto out_fail_1;
-
-  grub_snprintf (fdir, sizeof (fdir), "device/vbd/%s/backend-id", dir);
-  buf = grub_xenstore_get_file (fdir, NULL);
-  if (!buf)
-    goto out_fail_1;
-
-  dom = grub_strtoul (buf, 0, 10);
-  grub_free (buf);
-  if (grub_errno)
-    goto out_fail_1;
-
-  virtdisks[vdiskcnt].shared_page =
-    grub_xen_alloc_shared_page (dom, &virtdisks[vdiskcnt].grant);
-  if (!virtdisks[vdiskcnt].shared_page)
-    goto out_fail_1;
-
-  virtdisks[vdiskcnt].dma_page =
-    grub_xen_alloc_shared_page (dom, &virtdisks[vdiskcnt].dma_grant);
-  if (!virtdisks[vdiskcnt].dma_page)
-    goto out_fail_2;
-
-  alloc_unbound.dom = DOMID_SELF;
-  alloc_unbound.remote_dom = dom;
-
-  grub_xen_event_channel_op (EVTCHNOP_alloc_unbound, &alloc_unbound);
-  virtdisks[vdiskcnt].evtchn = alloc_unbound.port;
-
-  SHARED_RING_INIT (virtdisks[vdiskcnt].shared_page);
-  FRONT_RING_INIT (&virtdisks[vdiskcnt].ring, virtdisks[vdiskcnt].shared_page,
-		   GRUB_XEN_PAGE_SIZE);
-
-  grub_snprintf (fdir, sizeof (fdir), "device/vbd/%s/ring-ref", dir);
-  grub_snprintf (num, sizeof (num), "%u", virtdisks[vdiskcnt].grant);
-  err = grub_xenstore_write_file (fdir, num, grub_strlen (num));
-  if (err)
-    goto out_fail_3;
-
-  grub_snprintf (fdir, sizeof (fdir), "device/vbd/%s/event-channel", dir);
-  grub_snprintf (num, sizeof (num), "%u", virtdisks[vdiskcnt].evtchn);
-  err = grub_xenstore_write_file (fdir, num, grub_strlen (num));
-  if (err)
-    goto out_fail_3;
-
-  grub_snprintf (fdir, sizeof (fdir), "device/vbd/%s/protocol", dir);
-  err = grub_xenstore_write_file (fdir, XEN_IO_PROTO_ABI_NATIVE,
-				  grub_strlen (XEN_IO_PROTO_ABI_NATIVE));
-  if (err)
-    goto out_fail_3;
-
-  struct gnttab_dump_table dt;
-  dt.dom = DOMID_SELF;
-  grub_xen_grant_table_op (GNTTABOP_dump_table, (void *) &dt, 1);
-
-  grub_snprintf (fdir, sizeof (fdir), "device/vbd/%s/state", dir);
-  err = grub_xenstore_write_file (fdir, "3", 1);
-  if (err)
-    goto out_fail_3;
-
-  while (1)
-    {
-      grub_snprintf (fdir, sizeof (fdir), "%s/state",
-		     virtdisks[vdiskcnt].backend_dir);
-      buf = grub_xenstore_get_file (fdir, NULL);
-      if (!buf)
-	goto out_fail_3;
-      if (grub_strcmp (buf, "2") != 0)
-	break;
-      grub_free (buf);
-      grub_xen_sched_op (SCHEDOP_yield, 0);
-    }
-  grub_dprintf ("xen", "state=%s\n", (char *) buf);
-  grub_free (buf);
-
-  grub_snprintf (fdir, sizeof (fdir), "device/vbd/%s", dir);
-
-  virtdisks[vdiskcnt].frontend_dir = grub_strdup (fdir);
-
-  vdiskcnt++;
-  return 0;
-
-out_fail_3:
-  grub_xen_free_shared_page (virtdisks[vdiskcnt].dma_page);
-out_fail_2:
-  grub_xen_free_shared_page (virtdisks[vdiskcnt].shared_page);
-out_fail_1:
-  grub_free (virtdisks[vdiskcnt].backend_dir);
-  grub_free (virtdisks[vdiskcnt].fullname);
-
-  grub_errno = 0;
-  return 0;
-}
-
-void
-grub_xendisk_init (void)
-{
-  grub_size_t ctr = 0;
-  if (grub_xenstore_dir ("device/vbd", count, &ctr))
-    grub_errno = 0;
-
-  if (!ctr)
-    return;
-
-  virtdisks = grub_malloc (ctr * sizeof (virtdisks[0]));
-  if (!virtdisks)
-    return;
-  if (grub_xenstore_dir ("device/vbd", fill, &ctr))
-    grub_errno = 0;
-
-  grub_disk_dev_register (&grub_virtdisk_dev);
-}
-
-void
-grub_xendisk_fini (void)
-{
-  char fdir[200];
-  unsigned i;
-
-  for (i = 0; i < vdiskcnt; i++)
-    {
-      char *buf;
-      struct evtchn_close close_op = {.port = virtdisks[i].evtchn };
-
-      grub_snprintf (fdir, sizeof (fdir), "%s/state",
-		     virtdisks[i].frontend_dir);
-      grub_xenstore_write_file (fdir, "6", 1);
-
-      while (1)
-	{
-	  grub_snprintf (fdir, sizeof (fdir), "%s/state",
-			 virtdisks[i].backend_dir);
-	  buf = grub_xenstore_get_file (fdir, NULL);
-	  grub_dprintf ("xen", "state=%s\n", (char *) buf);
-
-	  if (!buf || grub_strcmp (buf, "6") == 0)
-	    break;
-	  grub_free (buf);
-	  grub_xen_sched_op (SCHEDOP_yield, 0);
-	}
-      grub_free (buf);
-
-      grub_snprintf (fdir, sizeof (fdir), "%s/ring-ref",
-		     virtdisks[i].frontend_dir);
-      grub_xenstore_write_file (fdir, NULL, 0);
-
-      grub_snprintf (fdir, sizeof (fdir), "%s/event-channel",
-		     virtdisks[i].frontend_dir);
-      grub_xenstore_write_file (fdir, NULL, 0);
-
-      grub_xen_free_shared_page (virtdisks[i].dma_page);
-      grub_xen_free_shared_page (virtdisks[i].shared_page);
-
-      grub_xen_event_channel_op (EVTCHNOP_close, &close_op);
-
-      /* Prepare for handoff.  */
-      grub_snprintf (fdir, sizeof (fdir), "%s/state",
-		     virtdisks[i].frontend_dir);
-      grub_xenstore_write_file (fdir, "1", 1);
-    }
-}

grub-core/efiemu/prepare.c

@@ -122,10 +122,7 @@ SUFFIX (grub_efiemu_crc) (void)
   int handle;
   grub_off_t off;
   struct SUFFIX (grub_efiemu_runtime_services) *runtime_services;
-  grub_uint32_t crc32_val;
-
-  if (GRUB_MD_CRC32->mdlen != 4)
-    return grub_error (GRUB_ERR_BUG, "incorrect mdlen");
+  grub_uint8_t crc32_context[GRUB_MD_CRC32->contextsize];
 
   /* compute CRC32 of runtime_services */
   err = grub_efiemu_resolve_symbol ("efiemu_runtime_services",
@@ -137,11 +134,12 @@ SUFFIX (grub_efiemu_crc) (void)
 	((grub_uint8_t *) grub_efiemu_mm_obtain_request (handle) + off);
 
   runtime_services->hdr.crc32 = 0;
+  GRUB_MD_CRC32->init(crc32_context);
+  GRUB_MD_CRC32->write(crc32_context, runtime_services, runtime_services->hdr.header_size);
+  GRUB_MD_CRC32->final(crc32_context);
 
-  grub_crypto_hash (GRUB_MD_CRC32, &crc32_val,
-		    runtime_services, runtime_services->hdr.header_size);
   runtime_services->hdr.crc32 =
-      grub_be_to_cpu32(crc32_val);
+      grub_be_to_cpu32(*(grub_uint32_t*)GRUB_MD_CRC32->read(crc32_context));
 
   err = grub_efiemu_resolve_symbol ("efiemu_system_table", &handle, &off);
   if (err)
@@ -149,11 +147,12 @@ SUFFIX (grub_efiemu_crc) (void)
 
   /* compute CRC32 of system table */
   SUFFIX (grub_efiemu_system_table)->hdr.crc32 = 0;
-  grub_crypto_hash (GRUB_MD_CRC32, &crc32_val,
-		    SUFFIX (grub_efiemu_system_table),
-		    SUFFIX (grub_efiemu_system_table)->hdr.header_size);
+  GRUB_MD_CRC32->init(crc32_context);
+  GRUB_MD_CRC32->write(crc32_context, SUFFIX (grub_efiemu_system_table),
+		      SUFFIX (grub_efiemu_system_table)->hdr.header_size);
+  GRUB_MD_CRC32->final(crc32_context);
   SUFFIX (grub_efiemu_system_table)->hdr.crc32 =
-      grub_be_to_cpu32(crc32_val);
+      grub_be_to_cpu32(*(grub_uint32_t*)GRUB_MD_CRC32->read(crc32_context));
 
   grub_dprintf ("efiemu","system_table = %p, runtime_services = %p\n",
 		SUFFIX (grub_efiemu_system_table), runtime_services);

grub-core/efiemu/runtime/config.h

@@ -19,18 +19,16 @@
 
 #define GRUB_TYPES_CPU_HEADER	1
 
-#ifdef __i386__
+#ifdef ELF32
 # define SIZEOF_VOID_P	4
 # define SIZEOF_LONG	4
 # define GRUB_TARGET_SIZEOF_VOID_P	4
 # define GRUB_TARGET_SIZEOF_LONG	4
 # define EFI_FUNC(x) x
-#elif defined (__x86_64__)
+#else
 # define SIZEOF_VOID_P	8
 # define SIZEOF_LONG	8
 # define GRUB_TARGET_SIZEOF_VOID_P	8
 # define GRUB_TARGET_SIZEOF_LONG	8
 # define EFI_FUNC(x) x ## _real
-#else
-#error "Unknown architecture"
 #endif

grub-core/font/font.c

@@ -33,7 +33,7 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
-#if HAVE_FONT_SOURCE
+#ifdef USE_ASCII_FALLBACK
 #include "ascii.h"
 #endif
 
@@ -110,14 +110,14 @@ static struct grub_font null_font;
 /* Flag to ensure module is initialized only once.  */
 static grub_uint8_t font_loader_initialized;
 
-#if HAVE_FONT_SOURCE
+#ifdef USE_ASCII_FALLBACK
 static struct grub_font_glyph *ascii_font_glyph[0x80];
 #endif
 
 static struct grub_font_glyph *
 ascii_glyph_lookup (grub_uint32_t code)
 {
-#if HAVE_FONT_SOURCE
+#ifdef USE_ASCII_FALLBACK
   static int ascii_failback_initialized = 0;
 
   if (code >= 0x80)

grub-core/fs/affs.c

@@ -36,7 +36,7 @@ struct grub_affs_bblock
   grub_uint8_t flags;
   grub_uint32_t checksum;
   grub_uint32_t rootblock;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* Set if the filesystem is a AFFS filesystem.  Otherwise this is an
    OFS filesystem.  */
@@ -51,14 +51,14 @@ struct grub_affs_rblock
   grub_uint32_t unused2;
   grub_uint32_t checksum;
   grub_uint32_t hashtable[1];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_affs_time
 {
   grub_int32_t day;
   grub_uint32_t min;
   grub_uint32_t hz;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The second part of a file header block.  */
 struct grub_affs_file
@@ -76,7 +76,7 @@ struct grub_affs_file
   grub_uint32_t parent;
   grub_uint32_t extension;
   grub_uint32_t type;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The location of `struct grub_affs_file' relative to the end of a
    file header block.  */

grub-core/fs/bfs.c

@@ -73,7 +73,7 @@ struct grub_bfs_extent
   grub_uint32_t ag;
   grub_uint16_t start;
   grub_uint16_t len;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_superblock
 {
@@ -89,7 +89,7 @@ struct grub_bfs_superblock
   grub_uint8_t unused3[32];
   grub_uint32_t magic3;
   struct grub_bfs_extent root_dir;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_inode
 {
@@ -118,11 +118,11 @@ struct grub_bfs_inode
       grub_uint64_t max_double_indirect_range;
       grub_uint64_t size;
       grub_uint32_t pad[4];
-    } GRUB_PACKED;
+    } __attribute__ ((packed));
     char inplace_link[144];
-  } GRUB_PACKED;
+  } __attribute__ ((packed));
   grub_uint8_t small_data[0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 enum
 {
@@ -134,7 +134,7 @@ struct grub_bfs_small_data_element_header
   grub_uint32_t type;
   grub_uint16_t name_len;
   grub_uint16_t value_len;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_btree_header
 {
@@ -151,7 +151,7 @@ struct grub_bfs_btree_header
   grub_uint64_t root;
 #endif
   grub_uint32_t unused2[2];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_btree_node
 {
@@ -165,7 +165,7 @@ struct grub_bfs_btree_node
   grub_uint16_t count_keys;
   grub_uint16_t total_key_len;
 #endif
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_data
 {

grub-core/fs/btrfs.c

@@ -53,7 +53,7 @@ struct grub_btrfs_device
   grub_uint64_t device_id;
   grub_uint64_t size;
   grub_uint8_t dummy[0x62 - 0x10];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_superblock
 {
@@ -71,7 +71,7 @@ struct grub_btrfs_superblock
   char label[0x100];
   grub_uint8_t dummy4[0x100];
   grub_uint8_t bootstrap_mapping[0x800];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct btrfs_header
 {
@@ -80,7 +80,7 @@ struct btrfs_header
   grub_uint8_t dummy[0x30];
   grub_uint32_t nitems;
   grub_uint8_t level;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_device_desc
 {
@@ -122,28 +122,28 @@ struct grub_btrfs_chunk_item
   grub_uint8_t dummy2[0xc];
   grub_uint16_t nstripes;
   grub_uint16_t nsubstripes;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_chunk_stripe
 {
   grub_uint64_t device_id;
   grub_uint64_t offset;
   grub_btrfs_uuid_t device_uuid;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_leaf_node
 {
   struct grub_btrfs_key key;
   grub_uint32_t offset;
   grub_uint32_t size;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_internal_node
 {
   struct grub_btrfs_key key;
   grub_uint64_t addr;
   grub_uint64_t dummy;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_dir_item
 {
@@ -156,7 +156,7 @@ struct grub_btrfs_dir_item
 #define GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK 7
   grub_uint8_t type;
   char name[0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_leaf_descriptor
 {
@@ -183,7 +183,7 @@ struct grub_btrfs_inode
   grub_uint64_t size;
   grub_uint8_t dummy2[0x70];
   struct grub_btrfs_time mtime;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_extent_data
 {
@@ -204,7 +204,7 @@ struct grub_btrfs_extent_data
       grub_uint64_t filled;
     };
   };
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 #define GRUB_BTRFS_EXTENT_INLINE 0
 #define GRUB_BTRFS_EXTENT_REGULAR 1
@@ -911,6 +911,7 @@ grub_btrfs_lzo_decompress(char *ibuf, grub_size_t isize, grub_off_t off,
 {
   grub_uint32_t total_size, cblock_size;
   grub_size_t ret = 0;
+  unsigned char buf[GRUB_BTRFS_LZO_BLOCK_SIZE];
   char *ibuf0 = ibuf;
 
   total_size = grub_le_to_cpu32 (grub_get_unaligned32 (ibuf));
@@ -954,21 +955,13 @@ grub_btrfs_lzo_decompress(char *ibuf, grub_size_t isize, grub_off_t off,
       if (off > 0 || osize < GRUB_BTRFS_LZO_BLOCK_SIZE)
 	{
 	  grub_size_t to_copy = GRUB_BTRFS_LZO_BLOCK_SIZE - off;
-	  grub_uint8_t *buf;
 
 	  if (to_copy > osize)
 	    to_copy = osize;
 
-	  buf = grub_malloc (GRUB_BTRFS_LZO_BLOCK_SIZE);
-	  if (!buf)
-	    return -1;
-
 	  if (lzo1x_decompress_safe ((lzo_bytep)ibuf, cblock_size, buf, &usize,
 	      NULL) != LZO_E_OK)
-	    {
-	      grub_free (buf);
-	      return -1;
-	    }
+	    return -1;
 
 	  if (to_copy > usize)
 	    to_copy = usize;
@@ -979,8 +972,6 @@ grub_btrfs_lzo_decompress(char *ibuf, grub_size_t isize, grub_off_t off,
 	  obuf += to_copy;
 	  ibuf += cblock_size;
 	  off = 0;
-
-	  grub_free (buf);
 	  continue;
 	}
 
@@ -1104,12 +1095,7 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data,
 					 - (grub_uint8_t *) data->extent),
 					extoff, buf, csize)
 		  != (grub_ssize_t) csize)
-		{
-		  if (!grub_errno)
-		    grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
-				"premature end of compressed");
-		  return -1;
-		}
+		return -1;
 	    }
 	  else if (data->extent->compression == GRUB_BTRFS_COMPRESSION_LZO)
 	    {
@@ -1163,12 +1149,7 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data,
 	      grub_free (tmp);
 
 	      if (ret != (grub_ssize_t) csize)
-		{
-		  if (!grub_errno)
-		    grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
-				"premature end of compressed");
-		  return -1;
-		}
+		return -1;
 
 	      break;
 	    }

grub-core/fs/cbfs.c

@@ -267,8 +267,7 @@ grub_cbfs_close (grub_file_t file)
   return grub_errno;
 }
 
-#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) \
-  && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN)
+#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
 
 static char *cbfsdisk_addr;
 static grub_off_t cbfsdisk_size = 0;
@@ -291,7 +290,7 @@ grub_cbfsdisk_open (const char *name, grub_disk_t disk)
 
   disk->total_sectors = cbfsdisk_size / GRUB_DISK_SECTOR_SIZE;
   disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
-  disk->id = 0;
+  disk->id = (unsigned long) "cbfs";
 
   return GRUB_ERR_NONE;
 }
@@ -376,7 +375,7 @@ static struct grub_fs grub_cbfs_fs = {
 
 GRUB_MOD_INIT (cbfs)
 {
-#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN)
+#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
   init_cbfsdisk ();
 #endif
   grub_fs_register (&grub_cbfs_fs);
@@ -385,7 +384,7 @@ GRUB_MOD_INIT (cbfs)
 GRUB_MOD_FINI (cbfs)
 {
   grub_fs_unregister (&grub_cbfs_fs);
-#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_XEN)
+#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
   fini_cbfsdisk ();
 #endif
 }